Merge "More SharedPreferences commit() -> apply() changes." into gingerbread