Merge "This code in CameraSource really should hold the lock." into gingerbread