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