Merge "Revert "Remove notifyConfigurationChanged listener and policy calls"" into main