When the cancel button is pressed during loading the ShortcutsCustomize, cancel the loading
Bug 858235 - Update Permission prompt Layout
Bug 859898 - All unsafe / unnecessary innerHTML
Bug 861152 - [Settings] Fix alignment of .fake-select
Bug 859917 - fixed x-heavy sms workload to be heavier
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 859750 - Items in value selectors get highlighted when scrolling r=rudyl

This is mostly reverting the work of commit 6b1a528e28da8a4e6244d0ed7f15f77da6b17805
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
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
Merge pull request #9186 from mcirlanaru/bug_861206

Bug 861206 - Don't prompt for SIM PIN entry if Settings app is opened
Merge pull request #9143 from mcirlanaru/bug_861152

Bug 861152 - [Settings] Fix alignment of .fake-select
Merge pull request #9201 from rnowm/header-pressed-button

Bug 816544 - [FTE] [BB] In WiFi screen: vertical line in header moves
Bug 830788 - [BB] [Headers] The left padding for the button's divider should be higher