Merge "Clear historical record on all package uninstall broadcasts" into main