Merge "Fix notification_policy user_set upgrade error" into sc-v2-dev