Merge "More migration to Global settings." into jb-mr1-dev