Merge "Removing redundant waiting for window change event and adding debug logging for dragging and dropping." into tm-dev