Merge "Ignore virtual presentation windows - RESTRICT AUTOMERGE" into tm-dev