Merge "Remove SessionCallbackLink"