[automerger skipped] Merge "DO NOT MERGE: Visualizer: Fix deadlock on close" am: f65c700c29 am: 001b864640 am: a08a1544b6
am: 5eb34a7418 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib80b932bb0553130ed6e2c69e4f8ac433a3b2ad8