Bug 921424 - Replace wait for landing page after unlocking with wait for displayed app to be homescreen
Bug 936494 - String not showing correctly after export to SD card
Bug 938707 - Fix failure of test_settings_do_not_track
Bug 932750 - Add helper methods to GaiaData to get and set Gecko prefs
Bug 932836 - [e.me] Cache Collection suggestion list for offline state
Bug 923177 - [e.me] [feature] Enable adding custom Collections while offline

r=[ranbena, evyatron]
Bug 930544 - Allow installing applications on several empty screens
Bug 925359 - Tapping on the Group call layer holds the call
Bug 936544 - [e.me][bug] Cloudapps do not get deduped in Collections [r=ranbena]
Bug 938051 - Intermittent failure in test_delete_contact
Bug 933279 - Updating the telephony part of the ScreenManager to work
with conference calls. r=alive
Bug 939773 - Fixing a ReferenceError: asyncStorage the first time the
keypad suggestion is used after a cold launch.
Bug 933206 - [Status Bar] Update Battery Icons
Bug 933815 Added a smoke test which launches the marketplace app
Merge pull request #13819 from KevinGrandon/revert_bug_930104

Revert "Bug 930104 - Remove localId=0 hack for the system app on firefox and correctly set permission for any app loaded in Firefox r=vingtetun"
Merge pull request #13265 from mcjimenez/bug930544

Bug 930544 - Allow installing applications on several empty screens
Bug 940173 - Unxfail test_ftu_skip_tour.py
Bug 940175 - Unxfail test_setup_basic_gmail.py
Bug 939110 - [system] Usage bar not showing in utility tray due to use wrong MobileConnection API
Bug 940162 - Modify passing params of SimPinDialog.show in order to accommodate recent change
Merge pull request #13823 from askeing/940175

Bug 940175 - Unxfail test_setup_basic_gmail.py