Merge "Add an upgrade step for settings moved to global." into jb-mr1-dev