Merge "[Status Bar Refactor] Remove some cruft from NotificationShadeWindowViewController."