Merge pull request #12356 from huchengtw-moz/camera/Bug_917382_secure_camera_screen_lock

Bug 917382 - [B2G][Camera][Lockscreen]Camera viewscreen turns black afte...r=djf
Merge pull request #12154 from yurenju/mod2arg2

Bug 904105 - part 1: using argument instead of module r=timdream
Bug 914705 - Move the disabled style to the shared style files
Merge pull request #12058 from luke-chang/908592_pinyin_symbol_panel

Bug 908592 - [Keyboard] Improve symbol panel layout of Pinyin IME. r=rudylu
Bug 910316 - [e.me] Everything.me features in enhanced branch for Firefox OS 1.2 r=crdlc
Bug 904105- part 2: create firefox extension

create a firefox extension for building gaia. you can follow instructions to use this extension:

1. cd <GAIA_DIR>/tools/extensions/gaia-build@gaiamobile.org
2. FIREFOX="<FIREFOX_BIN_PATH>" make run
3. go to tools -> addons and enable gaia-build extension (default is disable)
4. go to url: about:gaia
5. select your gaia dir and click launch gaia

another firefox window will be opened and running gaia.
Merge pull request #12415 from EverythingMe/enhanced-squashed

Bug 910316 - [e.me] Everything.me features in enhanced branch for Firefox OS 1.2 r=crdlc
Issue 900399 v1 train (cherry picked from commit 2cae0622ee942906daaca90293441afdbd2cb7de)

Bug 900399 - let maximum image pixel resolution customizable, r=djf

Conflicts:

	build/applications-data.js
Merge pull request #12417 from evelynhung/issue-900399

Issue 900399 v1 train (cherry picked from commit 2cae0622ee942906daaca90293441afdbd2cb7de)
Bug 919951 - DateTimeFormat is no longer needed after deleting the clock in the landing page
Bug 905116 - Implement Homescreen Window + Homescreen Launcher
Merge pull request #12414 from alivedise/bugzilla/905116_master_v7

Bug 905116 - Implement Homescreen Window + Homescreen Launcher, r=timdream
Bug 920393 - Headers [BB] wrong margin in left button
Merge pull request #12396 from comoyo/fix_keyboard_nightly

Bug 920039 - Check if app has manifest in keyboard_helper. r=djf
Bug 920394 - [Keyboard] Build time default keyboard should use |utils.gaiaOriginURL| to generate app origin
Merge pull request #12264 from crh0716/917238

Bug 917238 - Load network.json for supported network types r=evelyn
Merge pull request #12035 from rnowm/disabled-list

Bug 912437 - [BB] Change the disabled state for list elements row
Bug 911958 - [e.me][feature] Configurable collections order by operators in build time
Bug 907041 - Ensure poweroff animation in portrait-primary
Merge pull request #12419 from rnowm/920393

Bug 920393 - Headers [BB] wrong margin in left button