Reparent task back to the surface control during change transitions

Test: manual - expand a bubble and swipe up to collapse it
             - do this repeatedly and observe the animation doesn't
               flash the task at the top of the screen
Bug: 279074446
Change-Id: I81ece15a1fb21bfb9687540b96cb1baaafb74cb4