Merge "Move onKeyguardChangded() to completeUnlockUser() (async)" into rvc-dev