Bug 916056 - cancel list menu when attention screen comes
Bug 912796 - Back to main screen when attention screen is shown
(cherry picked from commit 4fca449306951a2a602f30555ed6ca3d803aae03)
Merge pull request #12362 from frsela/STK/Bug910151

Bug 910151 - [Buri][REG][STK]should display the default text when execute get input command with default text parameter, r=timdream(cherry picked from commit b15ca7b6a895035b67cc593af926dfb9e701a027)
Merge pull request #12387 from leob2g/Bug_915992_Changing_default_configuration_to_Postpaid

[Cost Control] Bug_915992_Changing_default_config_to_Postpaid r=lodr(cherry picked from commit 16ac4d4db7b17ecddada3530388109c798485638)
Merge pull request #10534 from crdlc/bug-885625

Bug 885625 - homescreen icons overlap after dragging an icon from one pa...
Merge pull request #12344 from overholt/master

Bug 878700 - Untranslated text in 'Enter PIN' screen r=fcampo(cherry picked from commit c357e33b00d1c54774a4b0083b49457fad47afd6)
Merge branch 'v1-train' into v1.1.0hd
Bug 914454 - Add a new keyboard layout, "Greek SMS" to allow sending
messages with GSM 7-bit encoding.
Merge pull request #12518 from RudyLu/keyboard/greek_sms

Bug 914454 - Add a new keyboard layout, "Greek SMS" to allow sending. r=djf
Bug 914454 - Ensure SMS messages in only uppercase Greek letters are sent with 7bit encoding on the carrier partner network r=rwaldron

Set x-inputmode=-moz-sms-7bit for SMS only
(cherry picked from commit 4e14ffad41827a6aa10f3d62d3a8831ea626c738)

Conflicts:
	apps/sms/js/compose.js
Merge branch 'v1-train' into v1.1.0hd
Bug 923773 - Wrapper open.png need background-size
Merge pull request #12517 from asutherland/autoconfig-t-online

Bug 914520 - Skip t-online.de ActiveSync autodiscover by adding local autoconfig entry. rs=squb, a=blocking-b2g=leo+(cherry picked from commit e6c0e9706efe5e69ac03df6f85ef18bd5d6500dd)
Merge pull request #12489 from alivedise/bugzilla/916056_v1-train/listmenu-on-call

Bug 916056 - cancel list menu when attention screen comes, r=timdream, a=leo+
Merge pull request #12604 from jmcanterafonseca/fix_facebook_messaging

Bug 910112 - [B2G][Contacts]When click message button for facebook a con...(cherry picked from commit d1deec8d52ce46f95cf398b333926e5cbf7ae0b0)
Merge branch 'v1-train' into v1.1.0hd
Bug 906627 - [Camera][Helix] The flash light is still open after user pressed the home button

Conflicts:
	apps/camera/js/camera.js
Bug 923866 - HD: fix keyboard FTU in different resolutions
Merge pull request #12699 from timdream/timezone-bug813987

Bug 916068 - make sure tzselector still works w/o voice network, r=evelyn
Conflicts:
	shared/js/tz_select.js
Bug 907041 - Ensure poweroff animation in portrait-primary