Merge "Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e am: 2f75ebed19 am: 3e96041f7b" into rvc-qpr-dev-plus-aosp