Bug 952164 - [B2G][Camera] Camera on lock screen allows user to take picture after clicking thumbnail preview despite no camera button being present
Bug 934354 - [WAP push][CP] Pressing home key or opening other apps will close client provision message directly without any protections like pressing x button does(warning dialog shows).
Merge pull request #15138 from RudyLu/homescreen/Bug951563_css_tweak_wvga

Bug 951563 - CSS fix for the 5th row of app label on WVGA resolution.
r=crdlc.(cherry picked from commit e38079f27bd38d669c4f1eaf252429285523cb7a)
Merge pull request #14617 from Rik/move-status-messages-949542

Bug 949542 - Status messages are a bit too high r=etienne
(cherry picked from commit 344bebd8d611a3a5d330b041f78e587c154026e9)
Merge pull request #15451 from jaoo/934354

Bug 934354 - [WAP push][CP] Pressing home key or opening other apps will close client provision message directly without any protections like pressing "x" button does(warning dialog shows). r=gsvelto
Bug 960546 - [v1.3] Xfail test_set_passcode_by_settings
Merge pull request #15400 from wilsonpage/bug/952164-v1.3

Bug 952164 - [B2G][Camera] Camera on lock screen allows user to take pic...
Bug 959758 - [Messages] Long tapping any part horizontally adjacent to a message bubble brings up the message options menu r=julienw

https://bugzilla.mozilla.org/show_bug.cgi?id=959758
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
(cherry picked from commit 482a62a47ff9cbd5dfbed8b1c03277caa88d45c3)
Merge pull request #15363 from staktrace/email

Bug 958245 - Allow scrolling in textarea elements, and specifically the email compose field. r=asuth,arnau
(cherry picked from commit 07f64fff89ea2dc39af1438eb40fba153b0f4d1c)
Merge pull request #15387 from jrburke/bug960282-email-missing-attachment-name

Bug 960282 - Email missing attachment name r=asuth
(cherry picked from commit 24d96ea39dd00402d1c9224af7926eafec112394)
Merge pull request #15310 from arcturus/bug-953098

Bug 953098 - [Fugu][Contact] Search bar is unavailable after deleting co...
(cherry picked from commit 2c50c43d9410ea6cdbc010ddcf1f02087a8d81f6)
Merge pull request #15366 from gtorodelvalle/contacts-bug-931711-contact-id-down

Bug 931711 - mozContact constructor creates unconsistent objects with the 'undefined' string as 'id'
(cherry picked from commit 21ea73e5f17ddf769612942fc383200a63aa2c33)
Merge pull request #15263 from borjasalguero/subject_banner

Bug 952109 - [message] Subject. The banner informing the user that the m...
(cherry picked from commit d8f015f8ce8c70b59f939c6b03304dc39c28c809)
Merge pull request #15206 from jaoo/947946

Bug 947946 - Update values of APN profiles for new markets. r=kaze
(cherry picked from commit 73a7e0c15969a058964e92fad1925efead38dcfc)
Merge pull request #15462 from viorelaioia/b_960546

Bug 960546 - [v1.3] Xfail test_set_passcode_by_settings
Bug 937487 - Keyboard won't disappear after focusing an input and then launch an activity
Merge pull request #15467 from mpizza/Bug_937487_v1.3_KMEventHandler

Bug 937487 - Keyboard won't disappear after focusing an input and then launch an activity. r=alive.
Bug 958224 - [B2G][Browser] Deactivating the browser in landscape mode causes the browser screen to cut off
    --  add new condition 'opening' for isActive method.
Merge pull request #14887 from ian-liu/bluetooth/bug951566_fix_unknown_filename_while_sharing_blobs_without_name

Bug 951566 - [Bluetooth][Bluedroid] Unknown.jpeg shown in notification after file transfer via Bluetooth, r=@dominickuo
(cherry picked from commit 503af44c30a96eb0db5eab0ee6bfbeb397dea9bf)
Merge pull request #15117 from jaoo/945150

Bug 945150 - [DSDS] SIM manager(when PIN locked or no SIM), Call Settings, Message Settings and Cellular & Data are still accessible when airplane mode is on. r=arthurcc(cherry picked from commit cc28d9cf5214cbefb67171551ce2c367f7f80a7f)

Conflicts:
	apps/settings/js/connectivity.js