Merge "Merge "Controls UI - Handle 'not found' better" into rvc-dev am: 8761fbb5 am: 3c731d49 am: e25ed259" into rvc-qpr-dev-plus-aosp