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

Change-Id: I78da1cd92dad913a6cb33ed9520b4b27c65f9be1