Merge "Fix background PackageUsage writing."