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

Change-Id: I91cef465fd1c58deac4a1f8eae8a542b1ad8747c