Merge "Removing dependence on enable_facelock"