Merge "Test to encourage new settings to be backed up"