Merge "Always remove orphaned starting windows, no matter what the state" into oc-dev am: b5540300 am: c4f8175e Change-Id: Ia9b658a02d605a90b0dac2bb8b1a6736b8e65808