Bug 889925 - Explicitly set the active background of lockscreen icons to none.
Bug 889191 - [Video] video player shows spinner for the few events when playing local file.
Bug 881136 - hdpi/xhdpi resolution assets and layout for Browser app
Bug 877978 - Use IccHelper to access iccInfo. r=alive,arthur,fcampo,salva
Bug 890206 - [SMS] Messages dissapear from the thread when trying to re-send a failed message
Merge pull request #10905 from huchengtw-moz/video/Bug_889191_using_videojs_for_playing_bluetooth_files

Bug 889191 - [Video] video player shows spinner for the few events when. r=daleharvey
Merge pull request #10898 from arcturus/bug-890206

Bug 890206 - [SMS] Messages dissapear from the thread when trying to re-send a failed message
Bug 890460 - [SMS] After deleting all the messages in particular thread,the 'TODAY' bar still exists in thread_list r=borja

Ensure FixedHeader.refresh is called when rendering an empty screen
Merge pull request #10777 from gasolin/master-881136

Bug 881136 - hdpi/xhdpi resolution assets and layout for Browser app, r=dale
Merge pull request #10941 from julienw/890460-fixedheader-followup

Bug 890460 - [SMS] After deleting all the messages in particular thread,...
Bug 889899: use <div> instead of <iframe> for MMS attachment containers, r=julienw

Attachment containers use `<iframe>` in the SMS app because they are handy in the Compose area (work well in a contenteditable element): this ensures that attachment blocks are deletable but not editable.  However, `<iframes>` are a pain to use in the message thread, and can become a performance killer on threads with lots of attachments.

This patch keeps `<iframe>` containers for draft attachments in the Compose area but relies on `<div>` containers for the message thread.  To achieve this we use three templates:

* one `attachment-preview` template:
  - display it in a 80x80 px placeholder (can be extended to 120x80 or 80x120);
  - display the attachment size if in the Compose window;
  - do not display the file name for images
    (another patch will enable to display the file name on video with previews)

* one `attachment-nopreview` template: (audio, video, large images)
  - display the attachment type as a 80x80 px icon (audio, video, image, other);
  - display the attachment size if in the Compose window;
  - display the file name, both in the Compose window and in the message thread.

* one `attachment-draft` template to embed one of the two previous templates in an `<iframe>` container for the Compose area.

Non-draft attachments are displayed in a `<div>` container. In both cases (div or iframe), the container carries an `attachment-container` class and a `preview` or `nopreview` one.

Side notes:
* this fixes bug 882094 (display attachment file names in MMS);
* the `bubbleEvents` method has been slightly re-rewritten to be more self-explanatory;
* some basic cleanup has been done on the HTML & CSS front.
Merge pull request #10943 from fabi1cazenave/mmsAttachmentContainers-bug889899

Bug 889899: use <div> instead of <iframe> for MMS attachment containers, r=julienw
Merge pull request #10869 from eeejay/highlight-fix

Explicitly set the active background of lockscreen icons to none.r=mihai
Merge pull request #10906 from EdgarChen/bug_877978

Bug 877978 - [Gaia] Use new WebAPI to access iccInfo related attribute/event
Bug 889763 - [MMS] Only image is received when sending image + audio file from android device. Co-author with gnarf37
Bug 887712 - [SMS/MMS] Make editable cursor element "zero width" until any user interaction r=gnarf

https://bugzilla.mozilla.org/show_bug.cgi?id=887712

Includes: https://github.com/gnarf/gaia/commit/4880acb5ecf10b274dd8f6cf5e75b7d9ab5f8ab3

- Empty, out of focus placeholders contract to zero offset width
- Empty, in focus placeholders expand to rem-based width (margin: r & l, padding: r & l)
- When all recipients are deleted, don't leave empty editable in the to-field.
- When the editable placeholder is contracted to a zero offset width, it's possible to accidentally tap a recipient when the intention is to tap the to-field area around the recipient list, which will correctly prompt the user to remove the recipient. Since there is no way to unambiguously detect the user's intention, always handle "Remove" and "Cancel" in an intuitive way.

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Bug 891366: Provide unit test script in gaia/bin
Merge pull request #10867 from wanderview/unit-test-script

Bug 891366: Provide unit test script and make target. r=mwu
Bug 893120 - Fix devicestorage permissions for mochitest.
Merge pull request #10949 from dhylands/bug-893120-mochitest-perms

Bug 893120 - Fix devicestorage permissions for mochitest. r=dclarke