Bug 898792 - [Dialer] - The bottom buttons are not the same height
vbump marionette
Bug 902959 - Add option to suppress apps which have hidden roles
Bug 901500 - Adding Missing Email Images
Merge pull request #11352 from epang/bug901500_email_missing_images

Bug 901500 - Adding Missing Email Images r=samjoch
Bug 902973 - REAPPLY Disable sms notification_test.js for frequent TBPL orange, a=test-only

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Bug 901578 - Remove mouse_event_shim from settings
Bug 903477 - [Bluetooth] Bluetooth icons inner shadow is too dark - tone down
Merge pull request #11444 from lightsofapollo/vbump-marionette

vbump marionette
Merge pull request #11448 from KevinGrandon/bug_902959_add_getApps_param

Bug 902959 - Add option to suppress apps which have hidden roles r=vingtetun
Bug 903400 - Trim whitespaces for search in the e.me search bar. r=vingtetun,a=leo+
Revert "Merge pull request #11425 from comoyo/mozContacts2vcard"

This reverts commit 1b3b923534f606c69fce61136aa21849ee8bba6a, reversing
changes made to c354940fbe112bcf2d90e2a5654ad1824f3a2348.
Merge pull request #11464 from lightsofapollo/revert-11425

Revert "Merge pull request #11425 from comoyo/mozContacts2vcard"
Merge pull request #11353 from KevinGrandon/bug_901578_remove_mouse_shim_settings

Bug 901578 - Remove mouse_event_shim from settings r=kaze
Bug 903137 - [SMS][MMS] Contextmenu prompt for email in message should display email address r=gnarf

- Make all prompts consistent
- Ensures that dataset.isContact strings are only used to derive a true isContact boolean
- Renames ThreadUI.activateContact to ThreadUI.prompt
    - The function no longer serves as only a "contact" prompt
    - May prompt any type of recipient (contact, unknown, email)
    - May prompt from header, group list or message content
- Renames ThreadUI.genPrompt to ThreadUI.prompContact
    - genPrompt is meaningless
    - The function is explicitly for creating a prompt with a known contact
    - Includes the contact info lookup
- Converts promptContact arguments to an object, instead of named parameters
- Update LinkActionHandler to delegate to promptContact, instead of doing it's own duplicated lookup
- Adds tests to ensure that a something is displayed when something is provided
    - Could be any of the following:
      - DOM UL
      - Email address
      - Phone Number
      - Name
- Updates LinkActionHandler tests to use the correct new function names

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Bug 903365 - [Settings][HD] Settings icons inner shadow is too dark - tone down
music2: ux redesign

Conflicts:
	test_apps/music2/style/css/style.css
Bug 903521 - Camera not working in gaia when run in Firefox
Merge pull request #11470 from hotzenklotz/903521_camera_in_FF

Bug 903521 - Camera not working in gaia when run in Firefox r=kgrandon
Merge pull request #11468 from es92/music2uxUpdate

Music2 UX update