Merge "Fixed BackupSettingsTest (update blacklists)"