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

Change-Id: I300942ded9ca9768591706e6da569f659b9a559d