Bug 841657 - Don't show popup as soon as it got created
Merge pull request #8204 from alivedise/bugzilla/841657/prevent-window-open-in-background

Bug 841657 - Don't show popup as soon as it got created, r=timdream, a=blocking-b2g:tef+
[Bug 842213] Change shortcuts to use canvas instead of elements [c=crdlc]
Merge pull request #8236 from EverythingMe/shortcuts-to-canvas

[Bug 842213] Change shortcuts to use canvas instead of elements [c=crdlc]
Merge branch 'master' of https://github.com/rnowm/gaia