Merge "Use the same width as the TextView created layout." into honeycomb-mr1