Merge "Work on separating out the status bar management"