Merge "Camera: Fix potentail race condition" into rvc-dev am: 17f951088b

Change-Id: I88454477a5149b1594e9eeaae39615276b3be342