Merge "Fix callbacks not being unregistered from ProxyDispatcher" into tm-dev