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

Change-Id: I2a27d8b34967603b0621332651a31be025542c09