Merge "Pipe through featureId from context to Camera code"