Merge "Use new InputManager API."