Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
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.
Merge remote-tracking branch 'upstream/master'
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'
Merge remote-tracking branch 'upstream/master'
Bug 858235 - Update Permission prompt Layout
Merge remote-tracking branch 'upstream/master'
Bug 859898 - All unsafe / unnecessary innerHTML
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'