Merge "Remove NoOpHelper from SettingsBackupHelper" into main