Merge "2D Recents: Fix issue with undocking only one task" into nyc-mr2-dev