Merge "Remove InputManager#getInstance am: 1232b1336a am: 80140dfa71"