Merge "Merge "Controls Ui - Remove temporary 'success' msg" into rvc-dev am: 9f63e946 am: 2caf7fa7" into rvc-d1-dev-plus-aosp