[automerger skipped] Merge "Visualizer: Fix race condition in...

[automerger skipped] Merge "Visualizer: Fix race condition in setCaptureCallBack" into rvc-dev am: 5e0373b8 am: 41fb44ff am: 5c6dc806 am: ff4acfba -s ours am: 386a9730 -s ours

am skip reason: Change-Id Iaea62a0e2f7e7a996c1554b9ed89efb67fbdfc11 with SHA-1 fcfa734a is in history

Change-Id: I7f1d3732190ff9531aaea32dc83b677857c3726b