Merge "Fix race condition in UdfpsKeyguardView init"