Merge "Fix One Handed Feedback gesture's animations are quite jarring" into sc-dev