Merge "sdm: Fix topology after adding new mode"