Merge "Camera: Synchronize access to torch status map" into pi-dev