Merge "Pipe though featureId from context to note-ops by camera code"