Merge "Camera: Fix race between callback and unregisteration of callbacks" into rvc-dev am: f8673bf03d am: 85a78eb376 am: 5da38f9198

Change-Id: If957cf94d948fdb925e2002def8092a10ffd8cf6