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

Change-Id: Id24d365fa14dcdc0e2bd0e628b3c8156e1f1de7d