Merge "Fix testConfigurationUpdatesWhenResizedFromFullscreen" into nyc-dev