Merge "Fix unable to swipe up to exit one-handed mode under 2 button navigation" into sc-dev