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