am 8b7991a1: am bc4f1bd4: Merge "Clean up visualizer in case of failure" into lmp-dev

* commit '8b7991a1378fa5984f4936188009e7fc8d166606':
  Clean up visualizer in case of failure