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

Change-Id: I07eb33fe8df60b34b86380d6dbe8a3d03c7c6baa