Merge pull request #15352 from etiennesegonzac/bug-883080-exit-edit-missed-calls

Bug 883080 - Switching from all calls to missed calls should exit the call log edit mode. r=rik
(cherry picked from commit c49a8f154e7c0a82c324fc1aa66677dfa332ab59)

Conflicts:
	apps/communications/dialer/test/unit/call_log_test.js
Bug 961039 - Xfail test_cost_control_data_alert_mobile
Merge pull request #15370 from arcturus/bug-952482

Bug 952482 - [FTE] "SIM 1" is written to enter the PIN for the SIM, even...
(cherry picked from commit 95b27b6b190ab0f976ec08259ec69d808726b2ce)

Conflicts:
	apps/communications/ftu/locales/ftu.ar.properties
Merge pull request #15529 from viorelaioia/bug_961039_v1.3

Bug 961039 - [v1.3] Xfail test_cost_control_data_alert_mobile