Merge "Improve CommunalBackupHelperTest stability" into main