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

Change-Id: I20e29a45890b63995dc14d41e9ba941f43ec499e