Merge "Introduce developer option for Stylus handwriting" into tm-dev