Merge "Fixing issue with wrong initial multi-window mode." into oc-dev