Merge "InputManagerService: Refactor native methods to be testable" into tm-dev