Merge "Always remove orphaned starting windows, no matter what the state" into oc-dev
am: b55403008f

Change-Id: Iefaf12841c87abc14cac229ac4a27959d49d573a