Merge "Input system bug fixes, particularly for stylus. Bug: 5049148"