Bug 1064491: Request per-app data usage after first requesting total data usage. r=salva
Bug 1070858: [AppUsageMetrics] Track online status through navigator.onLine r=djf
Merge pull request #24959 from marshall/bug1070858_appUsageOnline_v2.1

Bug 1070858: [AppUsageMetrics] Track online status through navigator.onLine
Revert "Bug 1074028 - Overlapping rocketbar and statusbar icons for 3rd party apps"

This reverts commit 3cc2b505981b588b9811975302015e61537069f5.
Bug 1078859 - Force getScreenshot for system browser window instances displaying a web page. r=sfoster
Bug 1078654 - [Usage][Cost Control] In Usage app - Hide Apps from Mobile Data Usage list if they use 0 data
Bug 1073484 - [GAIA][Contacts]Edit two times in contact search result in improper contact data
Bug 1077637 - Actually set the visited history correctly. r=kgrandon

Conflicts:
	apps/system/js/places.js
	apps/system/test/unit/places_test.js
Bug 1068470 - [soft-home-button] SHB missing when lockscreen is on, and there is an incoming call
Bug 1078727 - GPS icon in status bar can sometimes take 30–60 seconds to update in B2G 2.1
Bug 1072500 - Do not launch FindMyDevice when user triggers Camera from LockScreen

When the user triggers Camera from the LockScreen, FMD will catch the
event and wake up. This consumes a preallocated process at least.
Figures shows that we double the launch time from the Camera app point
of view.
Merge pull request #25011 from nullaus/bug1078859

Bug 1078859 - Force getScreenshot for system browser window instances di...
Bug 964816 - Add Albanian keyboard layout support.
r=janjongboom.
a=2.1+, fabrice
Merge pull request #24320 from RudyLu/keyboard/Bug1059745-Albanian_dict

Bug 1059745 - Albanian word suggestion.
r=janjongboom.
a=2.1+, fabrice.
(cherry picked from commit 368574bc954bdda795d35c69a3110c53b3a8707c)
Bug 1007547 - Add keyboard and wordlist for Basque.
r=janjongboom.
a=2.1+, fabrice.
Bug 1077022 - [Keyboard] European Portuguese (pt-PT) based keyboard is missing.
r=rudylu
a=2.1+, fabrice.
Bug 1081658 - Fix l10n remove locale regex
Bug 1071451: [AUM] Handle attention windows properly so phone calls are counted. r=djf
Bug 1075455 - Sync present date on month view
Bug 1071647 - UI Tests: Remove cost control app kill step, make test use local resource