Merge "Controls UI - Marquee + dynamic column count" into rvc-dev am: f241f952 am: 08b9a301 am: 7b43ce20 Change-Id: I3f3dc9d87b85f8adf348adab8cfe97e884bd542f