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

Change-Id: I3fc5ce8a48cbcc7c1e655b808d174d759bc36e54