Merge "Revert "Reland: Dispatch TaskOrg events before finishing surface placement"" into sc-dev