am 20eb594a: am 8a924242: Merge "Revert "Only keep user switcher bitmaps if needed"" into lmp-mr1-dev

* commit '20eb594ab27a9e4dee83574b3fe36a5a6d0d7807':
  Revert "Only keep user switcher bitmaps if needed"