Merge "Expand touch target of split cancel button to meet a11y requirements" into main