Merge "Improved visual debugging in NotificationPanelViewController"