Merge "Remove window container from empty task when destroying." into oc-dev