Merge "Fix input device listener registration in InputManager"