Merge pull request #7483 from fabi1cazenave/lockscreen-on-locale-switch

Bug 824954 - do not restart the lockscreen when switching locale
Merge pull request #7441 from KevinGrandon/bug_812534_email_keyboard_focus

Bug 812534 Enlarge touch targets for email to be the entire visible area.
Bug 827871 - [setting] the language selector is too small
Merge pull request #7437 from pivanov/bug-827871

Bug 827871 - [setting] the language selector is too small
Bug 827382 - Work around the white screen flicker in settings
r=kaze
Bug 828762: Redunand '>' in index.html
Merge pull request #7469 from zbraniecki/bug828762

 Redundant ">" in Calendar's index.html
Bug 826312 - Ignore MP4 files with unknown ftyp atoms r=dkuo
Merge pull request #7517 from etiennesegonzac/bug-827382-settings-white-flickr

Bug 827382 - Work around the white screen flickr in settings
Bug 829110 - add tests for navigator.mozId.request oncancel() callback
Bug 828197 - make the onpair screen of bluescreen properly handle home key. r=etienne
Merge pull request #7524 from vingtetun/828197-landing

Bug 828197 - make the onpair screen of bluescreen properly handle home k...
Merge pull request #7523 from jedp/829110-test-oncancel

Bug 829110 - add tests for navigator.mozId.request oncancel() callback; r=ferjm
Bug 828578 - [Email] Not able to compose a new email by tapping an email address in an email body. r=lightsofapollo, a=blocking-basecamp
Merge pull request #7399 from escapewindow/master

Bug 827778 - Move shared/resources/languages-*.json to locales/, r=kaze
Merge pull request #7525 from asutherland/email-fix-mailto

Bug 828578 - [Email] Not able to compose a new email by tapping an email address in an email body. r=lightsofapollo, a=blocking-basecamp
Bug 828936 - make video deletion work r=daleharvey a=blocking+
Bug 818463 - remove duplicate 'reset-tracking' string
Merge pull request #7357 from EverythingMe/shortcuts-more-offline

[Bug 826198] Shortcuts More button - added offline connection message [r=crdlc]
Merge pull request #7314 from EverythingMe/bugfix-offline-home

[Bug 827251] Fix Home button behavior when offline [r=crdlc]