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

Change-Id: I60c05be39a2b9d6686b116c70c80032e2ab8bfab