Merge "Fix freeform task surface is not shown" into sc-dev