Merge "Maintain focus on switch for a11y"