Merge "DO NOT MERGE: Add remapping for an Android stylus" into tm-qpr-dev