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

Change-Id: I8ba05dfb25333abf0c4facdfde0802073ce8cf34