Merge "Redesign One-haned tutorial UX behavior" into sc-dev