Bug 905889 - [Buri][PLMN]Network name will be shown twice.
Bug 917828 - Remove the phone number assert in /settings/test_settings_device_info.py
Merge pull request #12300 from teodosia/update-assert-device-info

Bug 917828 - Change the phone number assert in /settings/test_settings_device_info.py to assertIsNotNone in v1-train
Merge pull request #12245 from EverythingMe/bugfix-903405

[Bug 903405] [E.me][L10n] After changing language, the description in e.me should change [r=crdlc](cherry picked from commit b3d003e1c92f6bd685be275b57f17d186ffcaaa7)
Bug 900399 - let maximum image pixel resolution customizable
Merge pull request #12390 from evelynhung/issue-900399-v1-train-2

Issue 900399 v1 train 2
Bug 833660 - hide icon when calling addNotification without icon parameter

Conflicts:
	apps/system/js/notifications.js
Merge pull request #12421 from yurenju/wrong-notification-icon

Wrong notification icon r=@timdeam
Merge pull request #12385 from snowmantw/issue905889-v1train

Bug 905889 - [Buri][PLMN]Network name will be shown twice, r=timdream