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

Change-Id: I0250a5af19218537041e45bfa6514c41c278908d