Merge "Add support to retry for DDS switch failures" into sc-dev