Merge "Don't crash on transport unregistration if there is no current transport"