Merge "Fix InputDevice listener notification for merged controller."