Merge "Controls UI - Fix crash on missing control" into rvc-dev