Merge "Additional cases for stylus handwriting without IC" into main