Merge "Extend DDS switch validation timeout" into main