After some investigation, it looks like in most all scenarios we use Content-Disposition:attachment. The exception is when double-clicking on a file in the file-browser (vs using the download button).

I need to fire up a Windows VM, but I'll see if that fixes the problem.