[automerger skipped] Merge "DO NOT MERGE Fixed size of buttons in switch user panel" into pi-dev am: bd74ac1a6d
am: a67bc6deb3  -s ours

Change-Id: Ie185bb9f574ae6a14c00057401422af64ec32dee