Merge "Do not gate updating allDrawn on all child WindowStates." into oc-dr1-dev