Merge "Camera: Fix deadlock caused by ordering of mStatusLock and mCameraStatesLock." into rvc-qpr-dev