Merge "Rebind backup transports only when clearly needed" into mnc-dev