Merge "Focus remains on the button after turning on/off"