Merge "Controls Ui - Remove temporary 'success' msg" into rvc-dev am: 9f63e946 am: 2caf7fa7 am: 6adc041a Change-Id: I078c6c69fd4960cff1bece3b3ead94294df577ee