When the cancel button is pressed during loading the ShortcutsCustomize, cancel the loading
Add link to the MDN page to the wiki link as it has better instructions.
Bug 830572 - MAC address label overlaps value

Displays MAC address label and value in two lines just like in the 'More information' view of 'Device information'
Bug 858235 - Update Permission prompt Layout
Bug 859898 - All unsafe / unnecessary innerHTML
Bug 845629 - [Gaia] change mcc/mnc type from integer to string. r=kaze
Bug 861152 - [Settings] Fix alignment of .fake-select
Bug 859917 - fixed x-heavy sms workload to be heavier
Bug 834207 - Fix menu button width change behavior for Phone Lock - Passcode setting screen. r=alive
Bug 861843 - Intermittent issue: Contact Settings screen does not appear.
Bug 802234 - Update sound setting styling for volume and tones (followup)
Bug 845660 - [Call] Proximity sensor shouldn't work on speaker/BT SCO mode in call.
  r=timdream, a=leo+.
Bug 856946 - Release CPU wakelock when active channel is telephony
Merge pull request #9197 from alivedise/bugzilla/856946_master

Bug 856946 - Release CPU wakelock when active channel is telephony, r=timdream, a=blocking-b2g:tef+
Merge pull request #9182 from samjoch/followup-bug-802234

Bug 802234 - Update sound setting styling for volume and tones (followup) r=me
Bug 861814 - Fix the SMS Mock
Merge pull request #9181 from marcofreda527/master

Bug 845660 - [Call] Proximity sensor shouldn't work on speaker/BT SCO mode in call, r=@timdream
Bug 861206 - Don't prompt for SIM PIN entry if Settings app is opened. r=etienne
Merge pull request #9180 from jmcanterafonseca/fix_settings2

Bug 861843 - Intermittent issue: Contact Settings screen does not appear...
Bug 816544 - [FTE] [BB] In WiFi screen: vertical line in header moves its position when Refresh button is tapped