Merge "Revert "Refactor PanelView and NotificationPanelView into Controllers.""