Merge "Controls Ui - Handle error scenarios" into rvc-dev am: c046b595 am: d6eeac52 am: 93a01b72 Change-Id: I83fb746468ae49205b7004aa679e785d6c7f849a