Merge "Fix window visibility during layout" into oc-mr1-dev