Merge "Deprecate StubInvocationListener"