Merge "Enforce that the user switcher icons are circular" into pi-dev
am: 52edc7c2ad

Change-Id: Ide83dd7cbc007e995e0641ff20cb7c51ce13fa86