Merge "[don't auto-merge] Don't re-read SharedPreferences unnecessarily." into gingerbread