Fix status bar flashing after orientation change

hand merge 43a87c5c874f1b8fbf582ff522f10051a6434906
and add some more fixes

Change-Id: Iea608bfba37e2e4c6a3430c13f683e54b0eff64b
1 file changed