Merge "Fix One-handed mode Settings Main Switch does not update its state correctly" into sc-dev