Merge "Fix BackupSettingsTest (update blacklist)"