Merge "Fix crash in Settings > Security" into jb-mr1-dev