Merge "Remove ellipse touch detection flag" into main