Note that this commit breaks a few things in that non video/image do not work and sharing media isn’t currently using the new mechanism either
Daniel Gultsch