Merge "Fix face/fingerprint consent primary footer button logic" into sc-dev