Merge "logcat: Minor fixes"