Merge "Controls UI - Handle 'not found' better" into rvc-dev