Merge "More UI tweaks." into honeycomb