Merge "Merge "Controls UI - Fix icon, title, subtitle for error states" into rvc-dev am: 0cf37c40 am: a4827ac2 am: c58a09cd" into rvc-qpr-dev-plus-aosp