Merge "Show more security settings, and fix missing summary in widget selection." into jb-mr1-dev