Merge "Merge "Coordinate configuration changes and window frame size." into oc-dev am: 749cbb1911 am: 42e95f8b54"