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

Change-Id: Ib8749281f442c506e02affdcd4edaa6c63510c0c