Bug 904013 - [Contacts] Replace "+" Icon in contacts for 1x, 1.5x and 2x
Bug 903360 - [HD] Blue time stamp is too small and should be closer to the right edge
Bug 903365 - [Settings][HD] Settings icons inner shadow is too dark - tone down
Merge pull request #11548 from RudyLu/keyboard/Bug902352-placeholder_as_word_separator

Bug 902352 - Make Gaia keyboard treats the placeholder
r=timdream(cherry picked from commit be95c3b6757290fff4fdde7a2b73c68f599131a1)
Bug 905950 - [Messages] Recipient assimilation should only occur when composing a new message r=gnarf

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

- Restrict recipient assimilation:
    - Only when in #new view
    - Only when there is a placeholder to inspect

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Merge pull request #11518 from crh0716/886002

Bug 886002 - Reset the stack bar everytime we are trying to refresh it r=evelyn(cherry picked from commit d65666d865b2b1ae686744be7e30c3d737db80a7)
Merge branch 'v1-train' into v1.1.0hd
Bug 906543 - Update Graphics in 1.1HD for WVGA Device - remove video_pause_button@1.5x.png from [browser]
Bug 903271 - Show statusbar when attention screen appears on fullscreen app
Merge pull request #11601 from rexboy7/fix-bug903271

Bug 903271 - Show statusbar when attention screen appears on fullscreen app
Bug 904020 - [HD][Email] Manual Setup Email has a small dropdown
Merge pull request #11568 from mcirlanaru/bug_899236

Bug 899236 - [Lockscreen] Reintroduce camera button for... r=@alivedise(cherry picked from commit 86d7d11b4637977b4131845b311e4348fb42d131)

Conflicts:

	apps/system/js/lockscreen.js
Merge pull request #11620 from mcirlanaru/v1-train_bug_899236

Bug 899236  - [Lockscreen] Reintroduce passcode screen camera button [v1-train uplift]
Merge pull request #11608 from samjoch/bug-904020-v110hd-HDEmailManualSetupEmailHasASmallDropdown

Bug 904020 v110hd hd email manual setup email has a small dropdown
Merge pull request #11495 from pivanov/HD-bug-904013

Bug 904013 - [Contacts] Replace "+" Icon in contacts for 1x, 1.5x and 2x
Bug 905558 - Perform operations on active call at first, fallback to the previous call if the active call is null r=etinne a=leo+
Merge pull request #11038 from frsela/STK/Bug893614_b

Bug 893614: [STK]The maxlength of the inputbox didn't set corretly in GE.T_INPUT command. r=timdream
Merge pull request #11038 from frsela/STK/Bug893614_b

Bug 893614: [STK]The maxlength of the inputbox didn't set corretly in GE.T_INPUT command. r=timdream
Bug 903371 - [HD][Status bar] Time on the status bar need to be vertically centered r=samjoch
Merge pull request #11494 from pivanov/bug-904013

Bug 904013 - [Contacts] Replace "+" Icon in contacts for 1x, 1.5x and 2x r=samjoch

(cherry picked from commit 979b5e544b11f378a1d1c25454ce58c7e446b7e4)

Conflicts:
	apps/communications/contacts/style/app.css