Merge "Better handle MSIM DDS changed event"