Merge "Don't animate TextView marquee if not visible"