Bug 1020005: Send 'shrinking-stop' instead of 'shrinking-reject' event whenever 'techLost' event happens.
Also modified respective test case in nfc_manager_test.js. r=gweng
Bug 876815 -[usage] don't mention phone calls in settings sub-header
Bug 837677 - [e-mail] Implement new startup loading events
Bug 1020845 - [Ringtones] Ringtones list needs a press state
Bug 1024978 - [Messages] Activity Handler tests are failing with newer mocha r=azasypkin
Bug 1019039 - [homescreen-stingray] Intermittent Travis Unit Test failure: Applications predefined apps check state: Error: expected false to be true r=lchang
Bug 1021383 -[flame][cost control] Text in Usage Setup is not crisp
Bug 1025848 - [Vertical Homescreen] Gesture with two or more fingers ends in edit mode or showing the context menu
Bug 875159: Wrong message is displayed when no Gmail contacts are available to import
Bug 1018035 - [Flame][v1.4][SMS]No cursor display when tap the message edit box.  r=azasypkin
Bug 1022096 - [Messages] sms text truncated in delete messages mode r=azasypkin
Bug 1021496 - [Vertical] Implement bookmark app icon design from Classic Homescreen r=crdlc
Merge pull request #20550 from gitmai/bug-1021383-fte-remove-white-drop-shadow

Bug 1021383 -[flame][cost control] Text in Usage Setup is not crisp
r=salva
Merge pull request #20319 from jimporter/ringtones-manage-highlight

Bug 1020845 - [Ringtones] Manage Ringtones' list need a press state
Merge pull request #20493 from julienw/fix-homescreen-stingray-tests

Bug 1019039 - [homescreen-stingray] Intermittent Travis Unit Test failur...
Merge pull request #20455 from julienw/1018035-cursor-hidden-activity

Bug 1018035 - [Flame][v1.4][SMS]No cursor display when tap the message e...
Merge pull request #19289 from rsajdok/bug#875159b

Bug 875159: Wrong message is displayed when no Gmail contacts are availa...
Merge pull request #20171 from svic/mozillaorg

Bug 1020005: Send 'shrinking-stop' instead of 'shrinking-reject' event w...
Merge pull request #20578 from julienw/1022096-ellipsis-in-delete-mode

Bug 1022096 - [Messages] sms text truncated in delete messages mode r=az...
Merge pull request #20491 from julienw/fix-activity-test-newer-mocha

Bug 1024978 - [Messages] Activity Handler tests are failing with newer m...