Merge "Don't animate weight to 0 on face unlock bypass" into sc-dev