Merge "Revert "Revert "Remove notifyConfigurationChanged listener and p..."" into main