Merge "Controls Ui - Remove temporary 'success' msg" into rvc-dev am: 9f63e946d1 am: 2caf7fa79d am: 6adc041a51

Change-Id: I078c6c69fd4960cff1bece3b3ead94294df577ee