Bug1076158-[Video]-Fix of options button not responsive on the first touch r=wilsonpage
Bug 1077259 - Move the data connection settings from the per-sim panel to the upper panel r=eragonj
Bug 1080362 - Make sure we remove appclosed event listener
Merge pull request #25008 from mikehenrty/bug-1080362-appclosed-event

Bug 1080362 - Make sure we remove appclosed event listener
Bug 1070825 - Remove the check of not dialing the same number twice
Bug 1070058 - Create child/dialog windows when FTU is running. r=alive
Bug 1069286 - No tactile feedback when dialling a number
Bug 1061660 - Fix some missing show transitions on BaseUI elements. r=alive

Flush the style after element creation so that animations associated with
the visible class play.
Bug 1072075: don't allow system time changes to affect app usage timings
(cherry picked from commit 83af4279c67b36c96b04ffec04ae428b69eec51d)

reference bug 1069863 in comments

fix broken unit tests
Merge pull request #24974 from crh0716/1077259_v2.1

Bug 1077259 - Move the data connection settings from the per-sim panel to the upper panel r=eragonj
Bug 1077605 - [Email] Screen becomes black when scrolling through list fast
Bug 1071988 - Include date_time_helper.js

Conflicts:
	apps/clock/onring.html
Merge pull request #24903 from punamdahiya/bug1076158_v2.1

Bug1076158-[Video]-Fix of options button not responsive on the first touch r=wilsonpage
Bug 1073356 - [Calendar] Wobbly Refresh Icon Animation
Bug 1025147 - [B2G][Video]The slider overlaps the video time length when the playback ends
Bug 1074166 - Fix device type l10n missing issue