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

Change-Id: Iec7cd04a7a41f4276e46f1880fcef57fdac56463