Merge "Add null check onPackagesChanged"