Merge "Increased minimum logcat timeout from 20s to 50s..."