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