Merge "Don't use Settings for storing the backup enable state" into nyc-dev