Bug 972142 - Set camera preview style with CSS pixel values.
Merge pull request #16496 from jimporter/ringtone-pick

Bug 953093 - [Fugu][File upload selector] Choosing the system ringtones will go back to the webpage; r=djf
(cherry picked from commit 043b24fbe6f79bc3c0785717a8143eb27833f721)
Merge pull request #16504 from bentian/bug-972142

Bug 972142 - Set camera preview style with CSS pixel values, r=djf, a=1.3+
Revert "Bug 972142 - Set camera preview style with CSS pixel values."

This reverts commit 03404b44494fcaece0631a5effab771431a72e33.
Merge pull request #16639 from bentian/bug-972142

Revert "Bug 972142 - Set camera preview style with CSS pixel values." per bug 972142 comment 24.
Bug 975368 - reopen homescreen while it is killed at foreground.
Merge pull request #16646 from alivedise/bugzilla/975368/homescreen-is-not-activated

Bug 975368 - reopen homescreen while it is killed at foreground. r=timdream
Bug 969413 - Make the edit mode bottom margin rule apply only to the relevant elements r=julienw

(cherry picked from commit a0d1ec4a065613b4d8f10e3d07a0163631e0ebe8)