Merge "Revert "Change the resource cache key from context to package name."" into main