Merge "Use package name when caching SharedPreferences."