Merge "Support handling reconnect to QualifiedNetworkType" into main