Merge "Attempt to fix race of task surface visibility" into sc-dev