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

Change-Id: I4260a01e0082987fc6da0e8f8afd8fda96ba0e0f