Merge "Fix issue with overridden configuration in onConfigurationChanged" into nyc-dev