Bug 1078435 - Add recording resolution constraint to preview size selection.
Merge branch 'v2.1' into bug1078435
Fix function documentation.
Bug 1102789 - [Contacts] MS freeze when import contacts from memory card to phone

cherry-picked from 3deb9798ec02a20c64a45b9753c2a33ffcca045d
fix comments
Bug 1087441 (v2.1 backport): Apply font fix to FMD panel header, convert to AMD module. r=arthurcc
backport getJSON method into MockLazyLoader
Merge pull request #26629 from aosmond/bug1078435

Bug 1078435 - Add recording resolution constraint to preview size selection. r=jdarcangelo
Merge pull request #26926 from 6a68/bug-1087441-v2.1

Bug 1087441 v2.1
Revert "Merge pull request #26629 from aosmond/bug1078435"

This reverts commit 3919250c8884439a9faaddfa18057d8b8c7f6002, reversing
changes made to 6af3d029bae3a14f400fec0926f0f8ad7b579b4b.
Merge pull request #26880 from luke-chang/1102789_v2.1_import_vcard_freeze

Bug 1102789 - [Contacts] MS freeze when import contacts from memory card to phone
Bug 1088589 - [AppPermissions]Very hard to click "Hide info" to contract the info.
Bug 1105170 - [FFOS2.0][Woodduck][costcontrol] data usage does not consider dual SIM scenario while switch sim card

Conflicts:
	apps/costcontrol/js/app.js