Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev