Merge "Revert^2 "Remove notifyConfigurationChanged policy call"" into main