Merge "Controls UI - Update bg color for Stateless templates" into rvc-dev