Merge "Require permission to unlock keyguard" into sc-dev