Merge "Make Keyguard window focusable so that adb shell input command registers" into rvc-dev