Merge "Keep error message notification after stop" into rvc-dev