Merge proposals dependent on lp://staging/~laney/ubuntu-system-settings/security-privacy-set-security-demo

1. security-privacy-set-security-demo
2. Dependent merge proposals