Merge "Remove Dependency.staticOnConfigurationChanged"