Merge "Avoid unnecessary SharedPrefences disk writes." into gingerbread