Merge "Rework how we decide whether to use system or status bar." into honeycomb-mr2