Merge "Ensuring multi-window callbacks contain new configuration and are in order" into oc-dev