Bug 989847 - Handle webgl context lose/restore event for gallery editor mode
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 995964 - [v1.3] Fix for test_settings_airplane_mode.py
Bug 990003 - Introducing a dedicated callscreen app for dramatically
improved performances.

(cherry picked from commit 6513fe73854d7743e66eb3f1cfbbdf4e04874c3f)

Conflicts:
	apps/callscreen/index.html
	apps/callscreen/js/call_screen.js
	apps/callscreen/js/calls_handler.js
	apps/callscreen/style/images/ActionIcon_40x40_audiosourcemenu.png
	apps/callscreen/style/images/ActionIcon_40x40_audiosourcemenu@1.5x.png
	apps/callscreen/style/images/ActionIcon_40x40_audiosourcemenu@2x.png
	apps/callscreen/style/images/picture_emergency.png
	apps/callscreen/style/images/picture_emergency@1.5x.png
	apps/callscreen/style/images/picture_emergency@2x.png
	apps/callscreen/test/unit/call_screen_test.js
	apps/callscreen/test/unit/calls_handler_test.js
	apps/callscreen/test/unit/conference_group_handler_test.js
	apps/callscreen/test/unit/handled_call_test.js
	apps/communications/dialer/index.html
	apps/communications/dialer/js/call_log.js
	apps/communications/dialer/js/dialer.js
	apps/communications/dialer/test/unit/call_log_db_test.js
	apps/communications/dialer/test/unit/call_log_test.js
	apps/communications/dialer/test/unit/dialer_test.js
	apps/communications/dialer/test/unit/keypad_test.js
	apps/communications/dialer/test/unit/multi_sim_action_button_test.js
	apps/communications/dialer/test/unit/phone_action_menu_test.js
	apps/communications/dialer/test/unit/sim_picker_test.js
	apps/communications/dialer/test/unit/suggestion_bar_test.js
	apps/communications/dialer/test/unit/telephony_helper_test.js
	apps/system/js/attention_screen.js
	apps/system/js/bootstrap.js
	apps/system/js/dialer_agent.js
	apps/system/style/attention_screen.css
	apps/system/test/unit/bootstrap_test.js
	build/csslint/xfail.list
	build/jshint/xfail.list
	build/webapp-zip.js
	shared/style/dialer/keypad.css
	shared/test/unit/mocks/mock_navigator_moz_telephony.js
Bug 984243 - Increase the timeout value and force terminate when displaying the menu
Merge pull request #18281 from chirarobert/v1.3_airplane

Bug 995964 - [v1.3] Fix for test_settings_airplane_mode.py
Bug 992346 - Inline keyboard symbols font
Merge pull request #18294 from etiennesegonzac/instacallscreen-v1.3t

Bug 990003 - Introducing a dedicated callscreen app for dramatically
Merge branch 'v1.3' into v1.3t
Bug 997051 - [Gallery] the MAX_IMAGE_SIZE in inline viewer doesn't not use customization config value
Merge pull request #18223 from crh0716/984243_v1.3t

Bug 984243 - Increase the timeout value and force terminate when displaying the menu r=evelyn
Merge pull request #18184 from comoyo/bug992346-part1

Bug 992346 - Load Keyboard Symbols on keyboard startup, a=fabrice
Bug 969101: Initial implementation of a first-time use ping. r=fabrice
Bug 987496 - Adding Hindi Input Method for B2G (v1.3t)
Merge pull request #18401 from luke-chang/987496_v1.3t_hindi_input_method

Bug 987496 - Adding Hindi Input Method for B2G (v1.3t), r=rudylu
Bug 991509 - Adding Tamil input method for B2G (v1.3t)
Merge pull request #18405 from luke-chang/991509_v1.3t_tamil_input_method

Bug 991509 - Adding Tamil input method for B2G (v1.3t), r=rudylu
Merge pull request #14577 from Rik/stop-ringtone-power-button-890434

Bug 890434 - Impossible to silence an incoming call without rejecting it r=etienne
Conflicts:
	apps/communications/dialer/test/unit/calls_handler_test.js
Bug 991666 - Fix removal of old API notifications when selected from the toaster r=alive
Merge remote-tracking branch 'upstream/v1.3' into mergin-1.3-in-1.3t-april-18

Conflicts:
	apps/callscreen/js/calls_handler.js
	apps/callscreen/test/unit/calls_handler_test.js