Merge "Fixed double face auth on swipe" into sc-dev