LUCENE-7960 added the possibility to preserve the original term when using NGram filters. The documentation says to enable it with 'preserveOriginal' and it works for EdgeNGram filter. But NGram filter requires the initial planned option 'keepShortTerms' to enable this feature.
This inconsistency is confusing. I'll provide a patch with a possible fix.