Merge "Move verification settings to Settings.Global" into jb-mr1-dev