Merge "Controls UI - Marquee + dynamic column count" into rvc-dev am: f241f952 am: 05aa82a9 am: 4e39f65c Change-Id: I5c1e54013243eb26e96713034b04fa8fc1586f48