Merge "Actually move to Global settings." into jb-mr1-dev