Merge commit '136d8336b6cb18067cd783185dacef34ae785519' * commit '136d8336b6cb18067cd783185dacef34ae785519': This code in CameraSource really should hold the lock.
Merge commit '136d8336b6cb18067cd783185dacef34ae785519' * commit '136d8336b6cb18067cd783185dacef34ae785519': This code in CameraSource really should hold the lock.