Merge "Revert "Keep z-order of tasks when merged into recents transition"" into main