immersive mode >> expanded desktop

change back some strings and things that got stomped. VERY primitive
organization but will be back to 4.3 sexytime when i have more to work with.

PS2: fix CM's user switcher

infiltrate. destroy. rebuild.
        -Vanir

Change-Id: I5ae3630812eb74b3864062a55d9f790ec249e748