Merge "Fix CarUiTwoActionSwitch's Switch being cut off at cerain screen sizes" into sc-dev