Merge "Always showing FaceUnlock view before bind fixes 6330358"