Merge "Rename Visualizer::mLock"