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

Change-Id: I727bd81fb59f52cdffb10d3b22afbb3da04ecbfd