emulationstation: add two patches from unstable branch