Merge "Don't back up the scan-always setting." into jb-mr2-dev