Merge "Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e am: 5775784492" into rvc-d1-dev-plus-aosp