Merge "Use correct thread to remove starting window" into oc-mr1-dev am: 3e009eef52
am: 7b914561a0

Change-Id: I42a2f95adc9e68256794233c2c0738aafe19ebe6