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

Change-Id: I738b92752315d243accb12f7142a0acf60fe41bc