Merge "[Status Bar Refactor] In CollapsedStatusBarFragment, use NotificationPanelViewController instead of StatusBar.java."