Merge "Remove overlay when DC is mirroring" into sc-v2-dev