Merge "Keep error message notification after stop" am: 92352fa7c7

Change-Id: Ieaabd042ca959184c632d792c78ef69bf6f62a8f