Merge "Settings Switch animation jank while enabled One-handed mode" into sc-dev