Merge "Fix multiple configuration changes in multiwindow" into nyc-dev