Merge "Controls UI - Stateless controls" into rvc-dev am: dbc90fad28

Change-Id: Ia8b8dea96fc1d3d489a06a6e0f1088c0f202c9e9