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 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 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 940162 - Modify passing params of SimPinDialog.show in order to accommodate recent change
Merge pull request #13799 from etiennesegonzac/bug-939773-asyncstorage-error-suggestion

Bug 939773 - Fixing a ReferenceError: asyncStorage the first time the keypad suggestion is used after a cold launch. r=rik
Merge pull request #13530 from etiennesegonzac/bug-933279-conf-call-attention-screen-show

Bug 933279 - Always displaying the call screen attention screen for each extra incoming or outgoing call. r=alive
Bug 937389 - Refresh caller ID settings when settings app becomes visible
Merge pull request #13740 from crh0716/937389

Bug 937389 - Refresh caller ID settings when settings app becomes visible r=crh0716
Merge pull request #13535 from EverythingMe/936544-collections-dedup

Bug 936544 - [e.me][bug] Cloudapps do not get deduped in Collections [r=...
Merge pull request #13665 from bebef1987/delete_contact

Bug 938051 - Intermittent failure in test_delete_contact
[bug 906273] increase height of label wrapper to avoid clipping Arabic-script text

This enables us to display Arabic-script labels without clipping and without disrupting the baseline position of the label text; the margin adjustments are to maintain the existing position of the text in relation to the icon, while its display box is enlarged to allow for taller glyphs to be drawn.
Bug 917196 - When short tones are enabled make audible tones short too r=etienne
Merge pull request #13644 from bobsilverberg/gecko_prefs

Bug 932750 - Add helper methods to GaiaData to get and set Gecko prefs