Merge "Fixed size of buttons in switch user panel"