Merge branch 'wip-MDL-42068-m26-showshortnamefilepicker' of git://github.com/henesnar...