Merge "Restrict when a window receives new Configurations." into oc-mr1-dev