Merge "Guard Notification Panel against DISABLE2_NOTIFICATION_SHADE"