Merge "Separate ShadeController from StatusBar"