Cherry picks for `mate-media` 1.6

Hi,

These are my suggested `mate-media` cherry picks for the next tarball.

Regards, Martin.