Merge "Lock face when fingerprint is locked." into sc-v2-dev