Merge "Pixel were missing on the last line of text when using MaxLines." into honeycomb