Merge "Dynamically add STYLUS source for multi-touch devices - part 2"