Merge "Fix deadlock in CameraAccessController"