Merge "update trust state immediately when user auths via FP on keyguard"