Merge "Unregistering PackageMonitor only when has registered it"