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

Change-Id: Id23485272584d02e4ba45a332bca75ef5db1a610