Merge "Fix 5185505: allow facelock to be enabled by a setting."