Merge "Merge "Controls Ui - Handle error scenarios" into rvc-dev am: c046b595 am: d6eeac52 am: 93a01b72 am: 70c1d2ec" into rvc-qpr-dev-plus-aosp