Merge "Add FEATURE_CAMERA_CONCURRENT to goldfish" into rvc-dev