Merge "Add null check for SensitiveContentProtectionService" into main