Merge "Refactor acceptStylusHandwriting to use variant." into main