Merge "More preference item visual adjustments for smaller tablets. DO NOT MERGE" into honeycomb-mr2