Picked to master, rel_3_1 and rel_3_0, with followup commit to make sure only one radio option tries to gain focus.
Picked to master, rel_3_1 and rel_3_0, with followup commit to make sure only one radio option tries to gain focus.