Merge "MSIM: Fix user set DDS sub in hotswap cases." into p9.0