Bug 1022971 - Rename follow-up for merge conflicts r=me
Merge pull request #20396 from steveck-chung/bug-994553

Bug 994553 - [Sora][Message][Contacts]Contacts's head portrait do not display in Message. r=julienw
Merge pull request #20420 from mnjul/bug_1023642_lockscreen_classlist_undefined

Bug 1023642 - Javascript Error: window.lockScreen.classList is undefined [r=gweng]
Merge pull request #20211 from mnjul/bug_1021391_lockscr_unlock_icon_too_low

Bug 1021391 - [VsD Refresh] Lockscreen Visual Refresh > Unlock icon too low [r=gweng]
Merge pull request #20213 from mnjul/bug_1021860_lockscreen_icon_wrong_color

Bug 1021860 - [VsD Refresh] Lockscreen Visual Refresh > Lockscreen icons are not the right color  [r=gweng]
Bug 1024828 - [permission] there's a blank line between permission dialog and soft button
Bug 1020010 - [flame][gallery] [video] fuzzy icons
Merge pull request #20006 from pivanov/bug-1020010

Bug 1020010 - [flame][gallery] [video] fuzzy icons
Merge pull request #20467 from gasolin/issue-1022908

Bug 1022908 - [B2G][Flame][Browser] Camera and microphone permissions ar..., r=alive
Bug 973443 - [settings] refactor Display panel with AMD pattern
Bug 1016504 - Intermittent system/test/unit/bootstrap_test.js | system/Bootstrap "after all" hook | TypeError: navigator.mozL10n is undefined (http://system.gaiamobile.org:8080/js/internet_sharing.js?time=XXX) r=alive
Merge pull request #20466 from gasolin/issue-1024828

Bug 1024828 - [permission] there's a blank line between permission dialo..., r=alive
Bug 1022414 - [Vertical] Dragdrop improvements r=crdlc

Many improvements to drag drop in vertical homescreen including:
* Ignores dividers during distance calculation and relys only on icons or placeholders to determine proper drop target.
* Render a row of placeholders after the last divider. This ensures we have a valid drop target even if we ignore dividers.
* The last row of placeholders have a smaller size are are only for divider creation.
* Buffers from/to indexes to have slightly better performance and prevent the stuck icon situation.
Bug 1021343 - [Settings] Duplicated Homescreen entry r=crdlc r=yurenju
Merge pull request #20522 from KevinGrandon/bug_1021343_dual_homescreen_entries

Bug 1021343 - [Settings] Duplicated Homescreen entry
Merge pull request #20536 from KevinGrandon/bug_1022414_dragdrop_fixes

Bug 1022414 - [Vertical] Dragdrop improvements
Bug 1025723 - [LockScreen][System] Change the old locking events with new window events
Bug 989927 - [Contacts][Refactor] Create a library that reads the Global Contacts DataStore and provide a single contact
Merge pull request #20541 from cctuan/973443-2

Bug 973443 - [settings] refactor Display panel with AMD pattern
Bug 1021383 -[flame][cost control] Text in Usage Setup is not crisp