Merge "Window can only be fully drawn if app window is not relaunching" into oc-dev