Bug 991628 - [Settings][OMA CP] Not possible to select an APN received via OMA CP message if there is already one with the same name
Bug 998845 - [System] set the last play status to STOPPED if the media app is killed before the incoming call
Bug 991831 -[B2G][Tarako][Cost Control] The data usage bar in the notifications pull-down menu loads in slowly
Bug 997064: Do not call navigator.mozFMRadio from system app.
Merge pull request #18521 from etiennesegonzac/bug-997924-callscreen-fix-visibility

Bug 997924 - Make sure the preloaded callscreen doesn't keep an audio channel open
Conflicts:

	apps/callscreen/js/index.js
	apps/system/js/dialer_agent.js
Merge pull request #18574 from leonazhao/bug997924v1.3t

Bug997924v1.3t
Merge pull request #18172 from jaoo/991628-v1.3

[v1.3] Bug 991628 - [Settings][OMA CP] Not possible to select an APN received via OMA CP message if there is already one with the same name
Merge branch 'v1.3' into v1.3t
Merge pull request #18512 from dominickuo/v1.3t-bug-998845

Bug 998845 - [System] set the last play status to STOPPED if the media app is killed before the incoming call, r=alivedise
Bug 996141 - Put browser app in foreground when it invokes activity
Bug 999545 - Callscreen app needs write access to settings
Merge pull request #18625 from sprd-ffos/v1.3t

Bug 999545 - Callscreen app needs write access to settings
Merge pull request #18227 from gitmai/bug-991831-tarako

Bug 991831 -[B2G][Tarako][Cost Control] The data usage bar in the notifi...
Bug 989742 - [Tarako][Settings][Bluetooth] Unable to pair devices when a foreground app(not Settings app) is running.
Merge pull request #18522 from ian-liu/bluetooth/v13t/bug989742_migrate_pairing_flow_from_settings_to_bluetooth_app

Bug 989742 - [Tarako][Settings][Bluetooth] Unable to pair devices when a foreground app(not Settings app) is running. r=evelyn,arthur
Revert "Merge pull request #18154 from gasolin/issue-994493"

This reverts commit bbba09c732c35d9434ecb04d5e2e41d05511f4d9, reversing
changes made to 669de1b3f93a0a130d272e6de6edba4d9f1e4ca5.
Merge pull request #18577 from etiennesegonzac/bug-999478-on-demand-callscreen

Bug 999478 - Free the preloaded callscreen under memory pressure
(cherry picked from commit 03da6aab8a033d83835a245c968ce4dd2f06409e)

Conflicts:
	apps/system/js/attention_screen.js
	apps/system/js/dialer_agent.js
Bug 1001049 - use specific version of marionette apps
Merge pull request #18653 from mikehenrty/bug-1001049-semvar

Bug 1001049 - use specific version of marionette apps, a=test-only
Bug 989290: handle EXIF orientation in Camera and Gallery, and rotate images before picking or sharing them

make picking and cropping from gallery work with EXIF orientation

rotate image before editing if necessary (bug 989026)

Fix the single item share feature to rotate images before sharing

add a spinner animation during rotation

Make camera pick work by reducing image size, saving rotated image back to the sdcard, and displaying a spinner during the rotation

Add a build time config option with low-memory profile default so that images picked from the camera on Tarako come out 640x480

downsample in gallery pick activity so that returned images do not exceed the maxPickPixelSize build time config limit

Update gallery and camera share activities to use cropResizeRotate() and CONFIG_MAX_PICK_PIXEL_SIZE

unit tests for cropResizeRotate

address review comments, reduce spinner size, fix gallery share bug

address a review comment and add more tests