Merge "Fix security bug for TaskFragment creation" into sc-v2-dev