Merge "Controls UI - Stateless controls" into rvc-dev