Merge "Prevent keyboards from being recognized as a stylus" into main