Merge "Ensure all WindowStates are considered before determining all drawn."...
Merge "Ensure all WindowStates are considered before determining all drawn." into oc-dr1-dev am: e80ea58d
am: cb1e54e9
Change-Id: Idf844dffbbb2f1cb3e03d81f114dffebe28f905b