Merge "Fix <Routing Change> doesn't send on first switch."