Bug 974253 - Set preferred network type on startup based on the user preference
Merge pull request #17678 from crh0716/974253_v2_v1.3

Bug 974253 - Set preferred network type on startup based on the user preference
Merge pull request #17499 from dominickuo/bug-982540

Bug 982540 - [Music] Recover the status to PLAYING after the player is resumed from the mozinterrupend event, r=jimporter
Bug 988148 - Hide the mobile connection state if it is emergency calls only and not primary sim

Conflicts:
	apps/system/js/lockscreen_connection_info_manager.js
Bug 983777 - [B2G][Contacts] Tapping the Favorite button on an imported facebook contact will break the Edit Contact button
(cherry picked from commit 32078fe945de8001765526fa7e8e1283d3c09669)

Conflicts:
	apps/communications/contacts/test/unit/contacts_test.js
	apps/communications/contacts/test/unit/mock_navigation.js
Merge branch 'v1.3' into v1.3t

Conflicts:
	apps/communications/contacts/test/unit/mock_utils.js