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

Change-Id: I256360bb844415ab39b986c02279362b35141e40