Merge "[Settings] Add isActiveDataSubscriptionId for the DDS condidtion"