Merge "Add a null check when getting TransportConnection in PFTBT" into tm-dev