Merge "Camera: Synchronize access to torch status map" into pi-dev am: 0c4ef750ac
am: 91c133891a

Change-Id: I09298dedda14324feb80c5245ea394c4d6e28ceb