Merge "Fix QoS CB issue after NetworkAgent recreation" into main