Merge "Make handwriting surface ignore touch when stylus is down" into main