Merge "DO NOT MERGE Fixed size of buttons in switch user panel" into pi-dev