Merge "Make calculator text sizes smaller for 7" tablets." into honeycomb-mr2