Merge "Ensure all WindowStates are considered before determining all drawn." into oc-dr1-dev
am: e80ea58d60

Change-Id: I5c9592e68a5d462feb136ea0638647bbc516b711