Merge "Revert "Clear dream settings when package uninstalled"" into main