Merge "Fix NullPointerException in NotificationPanelViewController" into main