Merge "Controls UI - Remove focused control" into rvc-dev