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

Change-Id: I3e5d912fd3394580d9254a38bbae699dd1f9517c