Merge "DO NOT MERGE: Visualizer: Fix deadlock on close"
am: f65c700c29

Change-Id: I4f7f7af27b474badf95c4aa5e7ac4add860d2738