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