Merge "Defer TaskFragment removal until appeared" into sc-v2-dev