Merge "Change isStylusEvent behaviour" into main