Merge "Minor SharedPreference clean-up." into gingerbread