Add display:flex for fix height 100% on iframe
Revert "Bug 942854 - [Calendar] Scrolling the week view results into results into overlapping artifacts. r=kgrandon"

This reverts commit 78dc0c0013d25de52175e750e4be46bfb2727ef3.
Bug 972666 - [Calendar] lines over events longer than 2 hours
Bug 858017 - [COST CONTROL] Use Gecko native support for data usage alarms provided by NetworkStats API 2.0
Bug 977399 -[B2G][Cost Control] 'Reset report' picker cannot be changed after data reset
Merge pull request #16610 from gitmai/bug-858017-network-alarm-complete

Bug 858017 - [COST CONTROL] Use Gecko native support for data usage alar...
r=salva
Merge pull request #16621 from millermedeiros/972666-lines-over-events

Bug 972666 - [Calendar] lines over events longer than 2 hours r=gaye
Merge pull request #16706 from gitmai/bug-977399-error-reset-report-picker

Bug 977399 -[B2G][Cost Control] 'Reset report' picker cannot be changed ...
r=salva
Bug 969298 - [Gaia] Need to add setting menus for 'dun' and 'ims' apn types
Merge pull request #16657 from nucliweb/976665-Cost-Control

Add display:flex for fix height 100% on iframe
Merge pull request #16720 from jaoo/969298-2

Bug 969298 - [Gaia] Need to add setting menus for 'dun' and 'ims' apn types. r=kaze
Bug 970832 - Balance pending image loading counter

Contacts pictures were not correctly imported because the onscroll
handler was checking the |imgsLoading| counter to be able to stop
pending requests. However, decrementing this variable was only performed
in the onsuccess handler of the image loading. If for any reason you
have some that fails, they would not get accounted as not loading
anymore. Upon onscroll event, this would trigger window.stop() call,
which will at the end break in the middle your pending XHR that perform
pictures import. Thus, we also perform decrementation in the error
handler.