Merge "Transfer the actual dispatcher when the window is preserved" into tm-dev