Merge "Update/fix SensitiveContentProtectionManager test" into main