Merge "Use correct thread to remove starting window" into oc-mr1-dev