Merge "Fix status bar flashing after orientation change" into gingerbread