Unxfail test_cost_control_data_alert_mobile.py because Bug 971696 was fixed.
Bug 968963 - [E.me] Collection static apps names are not translated [r=ranbena]
Revert "Bug 968963 - [E.me] Collection static apps names are not translated [r=ranbena]"

This reverts commit f495f10df8c6f2c056d22d1878d46bccdae24835.
Merge pull request #16291 from chirarobert/v1.3_unxfail_data_alert

Unxfail test_cost_control_data_alert_mobile.py because Bug 971696 was fi...
Merge pull request #16201 from gitmai/bug-970323-CC-widget-broken-disable-airplane-mode

Bug 970323 - Cost control in the notification panel broken after disabli...
r=salva
Conflicts:
	apps/costcontrol/widget.html
Bug 952526 - Fix automatic scrolling of the message view when a new SMS is received r=rwaldron
Bug 968963 - [E.me] Collection static apps names are not translated [r=ranbena]