As discussed with lsolesen, a media module wrapper makes sense. So we have only to maintain one branch.
The attached patch adds the wrapper classes to differentiate media v1 / v2 functions.
There are to much changes needed, to support both media versions.
We will create a new branch for media 2.x
See #1844106: Create media gallery 2.x branch
Drupal is a registered trademark of Dries Buytaert.