Merge "Fix starting window isn't removed" into tm-dev