Merge "Keep error message notification after stop"