Fix Expanded Mode

This fixes the erratic behavior that causes fullscreen apps/games
to rotate into portrait, in expanded mode. Weird as usual!

PatchSet:
- small clean up

Change-Id: I72febac50a282f7b5bf570e46ef0dd38215a6bab