Merge "Add back gesture support when split selection active" into main