Merge "Add support for stylus"