Merge "Clear dynamic sensors during reconnect" into main