Merge "Revert "Revert "2/ Resolve gesture one handed conflicts swipe up..."" into sc-dev