Merge "Makes TYPE_NOTIFICATION_SHADE as trusted overlay"