Bug 1063352 - the contact update/import button is in a weird place
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
Bug 1058317 - [Browser] When watching YouTube on fullscreen, the video toolbar menu does not display

* Browser iframe was blocked by div.screenshot-overlay
Bug 1061941 - [Contacts] Editing visible information (name) is not reflected in 'Contacts' until page/app refreshes for newly created contacts
Bug 1058312 - [Contacts] Individual Contact Field 'Company' cannot be removed after being updated.
Bug 1062699 - NfcHandler fix to share url of active tab via NFC. +small renaming to match NFC terminology, r=gweng
Bug 1063256 - Need new strings for "{{n}} selected", due to new UX
Bug 1065179 - [System] Update app authentication dialog to use gaia-header
Bug1063291-[Video]-Fix back button in video pick activity r=wilsonpage