Merge "Controls Ui - Do not update controls without STATUS_OK" into rvc-dev am: ad9c1a8816

Change-Id: I1b463dbef4af80850ac39d473803a283c5836c8e