Merge "Add the Moves setting values to the backup list." into nyc-dr1-dev