Merge "Explicitly request focus after button pressed" into rvc-dev