Merge "Controls UI - Marquee + dynamic column count" into rvc-dev