Merge "Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long." into eclair