* commit '8a9242428b9d631ba841c166d062f158fd64f0f6': Revert "Only keep user switcher bitmaps if needed"