Merge "First step towards cleaning up Global settings." into jb-mr1-dev