Merge "Add config to override face unlock bypass setting" into sc-dev