Bug 1022480 - permission-request screen has a bonus message about 'Select a camera'
Bug 981674 - [Contacts] Contact's name merged to another one previously then exported to sd card and imported again, is not shown fine
Bug 1013845: Fix character encoding when sharing contacts via NFC
Bug 996398 - Use fastSeek API in Gaia video app

some refinements to the original patch

address review comment
Bug 1022098 - Icon display refactoring

  - Only cache icon results on the homescreen and not for the app:// protocol
  - Move default icon into the gaia_grid webcomponent
  - Ensure default icon is displayed for all users of the webcomponent
Bug 1022488 - Show search grid on submit
Bug 1023046 - Finetune app to app tranisiton by ordering
Bug 1023238 - Remember my choice is not the default option pre-selected in GUM permission
Merge pull request #20199 from lightsofapollo/icon-fallbacks

Bug 1022247 - Icon fetching refactoring
Merge pull request #20327 from lightsofapollo/1022488

Bug 1022488 - Show search grid on submit
Merge pull request #20321 from davidflanagan/bug996398

Bug 996398: use fastSeek() in the Video app
Merge pull request #20219 from gasolin/issue-1022480

Bug 1022480 - permission-request screen has a bonus message about 'Selec..., r=alive
Revert "Merge pull request #20224 from timdream/input-manage-transition2"

This reverts commit 211d8fb44f979ad72d0bd606c98007d68f6f64bd, reversing
changes made to adf6d4f66497c88d68a9e5509d740eef182af4f8.
Bug 1022475 - (Part I) Implement InputAppsTransitionManager
Bug 1022475 - (Part II) Let KeyboardManager use it
Bug 1022475 - (Part III) Fix JS marionette tests
Bug 1022475 - (Part VI) Fix Python tests
Merge pull request #20180 from kamituel/Bug_1013845_chinese_words_garbled

Bug 1013845: Fix character encoding when sharing contacts via NFC r=mbudzynski
Bug 1013207 - [Keyboard][Performance] Lazily load l10n.js
Merge pull request #20333 from timdream/input-manage-transition3

Bug 1022475 - Organizing keyboard transition management to another script, r=rudyl