am 294c32ce: am 5dab2fd3: am c7611429: am 3c3ceb9d: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev

* commit '294c32ce458b9d53796387cd59ba1cab3cd592ce':
  Use plain user icon in UserSpinnerAdapter