Resolve NotificationPanelView merge conflicts