Merge "Drop the cloned windows from visible window list" into tm-dev