Merge "Fix a race between requesting/loading/writing SharedPreferences." into gingerbread