Merge "Fix jank in TextView.Marquee"