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

Change-Id: I75622471354b9645bb494e85a22ab9f54181d697