Merge "Add window remove listener in SensitiveContentProtectionManagerService" into main