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