Merge pull request #23048 from mschwart/bug1042920

Bug 1042920 - Allow gaiatest testvars to overwrite default settings. r=viorela
Merge pull request #23720 from TheoChevalier/bug1062845-done

Bug 1062845 - Done button when picking a song in Ringtones manager is ha... r=dkuo
Bug 1030631 - [Dialer] Text not aligned when matches are more than 1 if contact has long name. r=rik
Merge pull request #23613 from sv99/1061290

BUG 1061290 chai add interfaces expect and should r=@yurenju
Merge pull request #23735 from ehsan/1063041

Bug 1063041 - Inline the activity options used in the SMS app in order to make it easier to automatically extract the activity arguments from the source code. r=azasypkin
Merge pull request #23077 from jpruden92/bug1030631-comm

Bug 1030631 - [Dialer] Text not aligned when matches are more than 1 if contact has long name. r=rik
Bug 1061735 - Post logcat to Treeherder report. r=rwood
Bug 1062699 - NfcHandler fix to share url of active tab via NFC. +small renaming to match NFC terminology, r=gweng
Bug 1061517 - Bump gaiatest version to 0.28. r=zcampbell
Bug 1062809 - [Contacts] Strange icon shown in the ICE Contact list when the Contact doesn't have picture
Bug 1059683 - Report one less pixel from KeyboardManager for ceiling due to dpx
Merge pull request #23700 from EragonJ/bug-1059106-another-try

Bug 1059106 - [settings] move root panel airplane mode item into panels r=arthurcc
Revert "Merge pull request #23700 from EragonJ/bug-1059106-another-try"

This reverts commit 91117b736b5a49dbc4cdab6a9a65b556a93f8a3e, reversing
changes made to 3a63cab02f3cbb3d29a87b6e6c1968ee67520fd4.
Bug 1061662 - [Contacts] Wrong images on contacts when building with GAIA_DEV_PIXELS_PER_PX=1.5
Merge pull request #23806 from stasm/940772-dehardcode-plural

Bug 940772 - Dehardcode the plural macro. r=gandalf
Merge pull request #23819 from pivanov/bug-1058752

Bug 1058752 - [RTL] Camera button alignment is off
Merge pull request #23850 from sergi/BUG_1061662

Bug 1061662 - [Contacts] Wrong images on contacts when building with GAIA_DEV_PIXELS_PER_PX=1.5 r=francisco
Merge pull request #23737 from yzen/bug-1063039

Bug 1063039 - update playing icon only if the audio channel actually cha...
Bug 1061127 - [Lockscreen] The time of notification in lockscreen keeps display just now as time elapsed
Bug 1048717 - [Messages][Refresh] Display call button at the header of single recipient thread. r=schung