Merge "Add error handling for onConfigurationChanged" into sc-v2-dev