Merge pull request #21636 from DouglasSherk/1030912-dialer-bluetooth-icon2

Bug 1030912 - Make BluetoothHelper listen for mozBluetooth events. r=ianliu
Merge pull request #21523 from acperez/bug-965826

Bug 965826 - Add mvno_match_data and mvno_type APN properties to the APNs from new market. r=jaoo
Merge pull request #21740 from cctuan/1037041

Bug 1037041 - [B2G][Flame][Music] Music app will not close after attempting to share through email in low memory environments
Merge pull request #21508 from millermedeiros/1002904-shared-icon-font

Bug 1002904 - calendar cold launch regression 100ms hamachi Apr23-Apr25 r=gaye
Merge pull request #21557 from qdot/1031369-tutorial-sim-pin-upgrade

Bug 1031369 - Show System SIM PIN dialog on upgrade after tutorial
Conflicts:
	apps/system/test/unit/sim_lock_test.js