Merge "Visualizer: fix native crash when visualizer release" am: bfb6086f67
am: 5959f23ac3

Change-Id: Id8a2ec3edb36875421145711fb05e719fd56c58f