Merge "Do not always skip preparing window to display when already visible." into oc-dev am: 4dfc067b am: 0cf1febd Change-Id: I8e09bad0c1bb0b0d2ab042b9fac6ed4dc09738b5