Merge "Clean up BackupSettingsHelper.getSummary()" into main