Merge "Update screen lock complexity permission to password complexity"