Merge "Rework logcat handling"