Merge "Dispose of TransportClient in BMS#beginRestoreSession" into sc-v2-dev