Merge "Prevent premature display of starting window." into oc-dev