Merge "Merge "Controls UI - Handle 'not found' better" into rvc-dev am: 8761fbb5 am: 745f8cdf" into rvc-d1-dev-plus-aosp