am 3c3ceb9d: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev

* commit '3c3ceb9d42ddd8ee65547183b3685fd088a6676e':
  Use plain user icon in UserSpinnerAdapter