Merge "Fix notification_policy user_set upgrade error"