Merge "Added nullptr check to pullFaceSettingsLocked"