Merge "Remove very repeated calls to onMergedOverrideConfigurationChanged" into main