Merge "Refactor PanelView and NotificationPanelView into Controllers."