Merge "Revert "Avoid remove starting window too early when playing multiple transitions"" into main