Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev