Merge "Ellipsize marquee TextViews that aren't currently animating"