Merge "Remove observer specific logic in PackageWatchdog" into main