Merge "Better handle MSIM DDS changed event" into oc-dev