Fixes various b2g desktop breakages...
Merge branch 'integrate-app-manager' of https://github.com/ochameau/r2d2b2g into ochameau-integrate-app-manager