Merge "Do not relayout when changing to Marquee"