Merge "Add new screen lock complexity permission"