Merge "Controls Ui - Remove temporary 'success' msg" into rvc-dev am: 9f63e946d1 am: d8bf072c02 am: 0735225fa0

Change-Id: I1016b544087c7d8b436443a853429ddd04e5bb2a