Merge "Ability to hide verification settings" into jb-mr1-dev