Bug 1033079 - Fix up DebuggerServer test after refactoring. r=janx
Merge pull request #21713 from jryans/multi-sockets

Bug 1033079 - Fix up DebuggerServer test after refactoring. r=janx
Bug 1038576 - [Rocketbar] Swiping starting from Rocketbar should not invoke Rocketbar r=crdlc
Merge pull request #21757 from KevinGrandon/bug_1038576_rocketbar_focus

Bug 1038576 - [Rocketbar] Swiping starting from Rocketbar should not invoke Rocketbar
Bug 1002904 - calendar cold launch regression 100ms hamachi Apr23-Apr25
Merge pull request #21508 from millermedeiros/1002904-shared-icon-font

Bug 1002904 - calendar cold launch regression 100ms hamachi Apr23-Apr25 r=gaye
bug 1024384 - Listen to default storage location change, update our device storage instances when needed. r=wilsonpage
Merge pull request #21782 from dmarcos/bug1024384

bug 1024384 - Listen to default storage location change, update our devi...
Bug 1007485 - manifest.webapp shoud not be localized in en-US if LOCALE_BASEDIR/en-US exists
Merge pull request #21172 from yurenju/multilocale-manifest

Bug 1007485 - manifest.webapp shoud not be localized in en-US if LOCALE_... r=@cctuan
Bug 1031369 - Show System SIM PIN dialog on upgrade after tutorial