Merge "Don't back up/restore the "automatically restore app data" setting" into nyc-dev