Merge "Camera: Avoid possible deadlock during R&C updates" into tm-dev