Merge "Fixed the logic when dynamic privacy is enabled" into sc-dev