Merge "Add Help lin to Settings > Security" into jb-mr1-dev