Bug 899501 - [Dialer] Layout adjusting for HD support on suggestion overlay
Bug 899123 - add pictures to contact reference workloads
Bug 898792 - [Dialer] - The bottom buttons are not the same height
Bug 903181 - Add a step value
bug 894815 - [lockscreen]permission screen and attention screen height fix on lockscreen camera
Bug 903477 - [Bluetooth] Bluetooth icons inner shadow is too dark - tone down
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
Bug 902549 - [B2G][l10n][Email] Double @@ signs in the second keyboard layer
Bug 894738 - Redirect appropriately from ViewEvent after tapping system notification for event alarm pulls us into calendar
Bug 903260 - [SMS][MMS] SettingsURL value is never used in sms/js/notification.js: Ringtones BROKEN

https://bugzilla.mozilla.org/show_bug.cgi?id=903260

- Make the mock's set method behave enough like the real thing to write a correct test
- Assign the result of the call to set(…) to the actual local setting
- Tests
    - Ensure that the src property is as expected

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Bug 903260 fixes tests, a=test-only

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Bug 901458 - [Buri][Settings]The interface display abnormal when input PIN code
Bug 898262 - HD: [CostControl] canvas and wifi/3g checkboxs not use screen space well
Merge pull request #11396 from gasolin/issue-898262

Bug 898262 - HD: [CostControl] canvas and wifi/3g checkboxs not use scre..., r=lodr
Merge pull request #11465 from littleq0903/bug-902649-2

Bug 902549 - [B2G][l10n][Email] Double @@ signs in the second keyboard layer. r=rudylu
Bug 894203 - Update the @1.5x assets for music app