Merge "Migrate more Secure settings to Global." into jb-mr1-dev