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

Change-Id: Iff41a057e90ddf5306994784c50f275f449b59ed