Merge "Revert "Only keep user switcher bitmaps if needed"" into lmp-mr1-dev