Visualizer: Fix deadlock on close
am: e8e1c69626

Change-Id: If122dd27a235651275b0cdce61e4486bddf828d8