Bug 908531 - [MediaDB] move the dummy file filter out of mediadb and use options to supply it.
Merge pull request #11918 from huchengtw-moz/video/Bug_909374_improve_view_activity_saving_feature_robustness

Bug 909374 - [Video] Improve view activity saving feature robustness, r=djf
Merge pull request #11919 from huchengtw-moz/camera/Bug_911669_flash_state_is_different

Bug 911669 - [B2G][Helix][Camera][ouyangming] The flash's state is diffe..., r=djf
Merge pull request #11779 from huchengtw-moz/video/Bug_908531_move_dummy_file_filter_to_video

Bug 908531 - [MediaDB] move the dummy file filter out of mediadb and use..., r=djf
Merge pull request #11934 from cvan/mkt-icons

Bug 901134 - Add higher-res Marketplace icon, r=timdream
Bug 903919 - [Flatfish][Gallery] add support for large device
Merge pull request #11595 from cctuan/903919

Bug 903919 - [Flatfish][Gallery] add support for large device
Bug 883565 - Settings interface for SIM PIN unusable due to UI misplacement, fix: focus on input once panelready
Bug 906756 - Algorithms for merging givenName and familyName. Master Contact takes precedence
Merge pull request #11940 from cctuan/883565

Bug 883565 - [Settings] Settings interface for SIM PIN unusable due to UI misplacement
Bug 897393 - Add a sample 3rd-party keyboard app for
testing.
Bug 912554 - [Contacts] Preserve givenName and familyName of the new or being edited contact when merging.
Merge pull request #11923 from RudyLu/Bug897393-sampleKeyboardApp

Bug 897393 - Add a sample 3rd-party keyboard app for
r=timdream
Bug 911903 - [Keyboard] Keyboard app doesn't load the layout engine
 Bug 912906 - Extend the unit test timeout to 5 seconds for
 browser_db_test.
Update gaia-ui-tests.json; Merge pull request #1303 from sashakruglov/issue_1217_gallery

migrate gallery share test to use actions
Merge pull request #11901 from luke-chang/911903_keyboard_not_load_engine

Bug 911903 - [Keyboard] Keyboard app doesn't load the layout engine. r=rudylu
Merge pull request #11853 from Rik/attention-screen-size-908186

Bug 908186 - Listen to mozbrowserresize events to hide or show the atten... r=etienne
Bug 910316 - [e.me] Everything.me features in enhanced branch for Firefox OS 1.2 r=crdlc
Merge pull request #11922 from acperez/bug-911809

Bug 911809 - Copy variant.json at build-time to ftu. r=yurenju