Merge "Preference string tweaks" into honeycomb-mr1