Merge "Add tests for BackupSettingsActivity"