Merge "Invalidate cached result of getPackagesForUid" into sc-dev