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 881146 - hdpi/xhdpi resolution assets and layout for First run experience app
Bug 881136 - hdpi/xhdpi resolution assets and layout for Browser app
Merge pull request #10910 from rexboy7/fixhd-881146-ftu-master

Bug 881146 - hdpi/xhdpi resolution assets and layout for FTU. r=arcturus
Bug 889717 - [Settings] Do not work when you are scrolling and select a menu
Merge pull request #10933 from mozshiao9/master_settings_889717

Bug 889717 - [Settings] Do not work when you are scrolling and select a menu, r=pivanov
Bug 892373 - @1.5x asset revise for Dialer app
Merge pull request #10934 from rexboy7/fix-bug892373-master

Bug 892373 - @1.5x asset revise for Dialer 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