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

Change-Id: Iacd4806bbf583ee6545eee36af1442f8d5da84e1