Merge "Remove ControllerCallbackLink"