Merge "cts-verifier: make logcat test screen scrollable"