Bug 1063352 - the contact update/import button is in a weird place
Bug 1061563 - extent test timeout from 180000 for build-test
Bug 997606 - [NFC] Arrow truncate on shrinking UI
Merge pull request #23891 from cctuan/997606-v2.1

Bug 997606 - [NFC] Arrow truncate on shrinking UI
Merge pull request #23876 from cctuan/1061563-v21

Bug 1061563 - extent test timeout from 180000 for build-test
Bug 1059434 - STK display text command doesn't support time duration
Bug 1059434 - STK display text command doesn't support time duration
Bug 1059100 - [email] Implement XOAUTH2 authentication support for gmail. r=asuth, r=jrburke, r=mcav

landing gelam https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/336 too
Bug 1059822 - close simpindialog if lockscreen is unlocked to camera app
Merge pull request #23921 from davidflanagan/bug1064126

Bug 1064126: be more efficient with canvas memory r=russn(cherry picked from commit a5949ec98cf3ed7bb46d8c7b13678ff3c767c71c)
Merge pull request #23965 from davidflanagan/bug1064126-v2.1

Merge pull request #23921 from davidflanagan/bug1064126
Bug 1061507 - Grey layer on contacts edit form when a photo is present
Bug 1062809 - [Contacts] Strange icon shown in the ICE Contact list when the Contact doesn't have picture
Bug 1061506 - Icons in contact edit form looking a bit fuzzy
Bug 1054718 - [Calendar] Wrong English in error message (automate changing end date/time)
- Update l10n labels as correct strings
Bug 1066024 - Correctly name hi-dpi assets. r=kgrandon
Merge pull request #23932 from cctuan/1059822-v21

Bug 1059822 - close simpindialog if lockscreen is unlocked to camera app
Bug 1063694 - [System] Fix SearchWindow prototype r=alive
Merge pull request #23818 from wilsonpage/1063352-v2.1

Bug 1063352 - the contact update/import button is in a weird place
Bug 1061438 - [Ringtones] Fix the wording for managing alerts; r=djf