Merge "DO NOT MERGE. Preference activity changes to work on smaller tablet screens." into honeycomb-mr2