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