Merge proposals dependent on lp://staging/~libretro/libretro/mgba-libretro-debian-tmp-erase-this-soon

1. mgba-libretro-debian-tmp-erase-this-soon
2. Dependent merge proposals