Merge "Update sensitiveNotificationAppProtection reference after move." into main