Merge "Refactor input reader to add stylus support. Bug: 5064702"