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