Merge "Visualizer: fix native crash when visualizer release" am: f9b76f7b43
am: b04bff0e0d

Change-Id: Ice31b953f0ad56a9c222c992fc01fc63de755302