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

Change-Id: I3f4bd6a88dc3592af20fdfe07e1e77a032351cf9