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.