Merge "Making Face Unlock fix that wasn't proerly merged in master"