Merge "LogEventsListGetExtraInputs: Keep $input and add $formDescriptor"