Merge "Change One-handed mode controls states in the Settings pages for improving better UX experience" into sc-dev