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

Change-Id: Ia4494fcadcea41d341d149d09276a53f14719a84