Merge "Listen to DDS change to update isDataEnabled" into main