Merge "Update configuration whenever the visible window is laid out." into oc-mr1-dev