Merge "Fixup InputManager javadoc"