Merge "Do not always skip preparing window to display when already visible." into oc-dev