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