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

Change-Id: I6594ad83ae479bbb99ceaf151ec2189eaae9c15d