Bug 830644 - [video][Hidpi]Support high resolution devices
Bug 848281 - Crop the background image in lockscreen
Merge pull request #8763 from rexboy7/hd-video

Bug 830644 - [video][Hidpi]Support high resolution devices
Bug 816260 - Hotspot Settings: No error message is displayed when Wi-Fi hotspot SSID is blank r='kaze'

An error Alert message is displayed in case of empty SSID and the fields are reverted to previous settings.
Bug 834103 - [OPEN_][Call setting]call forwarding icon in status bar does not disappear when remove SIM card.(617001982823). r=arthurcc
Merge pull request #8767 from jaoo/834103

Bug 834103 - [OPEN_][Call setting]call forwarding icon in status bar doe...
Bug 854097 - [email/IMAP] Saving sent mail to 'sent' folder on servers that don't support MULTIAPPEND regressed by bug 814257. r=asuth
Merge pull request #8777 from asutherland/email-fix-imap-append

Bug 854097 - [email/IMAP] Saving sent mail to 'sent' folder on servers that don't support MULTIAPPEND regressed by bug 814257. r=asuth
Bug 820365 - remove ringtones under apps/clock/style/ringtones folder
Bug 830057 - [bluetooth][gallery] Icon missing for Bluetooth Transfer in gallery sharing options
Merge pull request #8760 from gasolin/issue-830057

Bug 830057 - [bluetooth][gallery] Icon missing for Bluetooth Transfer in..., r=Ian
Merge pull request #8761 from crh0716/848281

Bug 848281 - Crop the background image in lockscreen. r=yuren
Bug 854292 - Add more safegaurds for headers being deleted while they have pending operations r=asuth
Bug 828278 - Discard the permission request when home button is pressed
Merge pull request #8759 from alivedise/bugzilla/828278/discard-permission-when-home-button-pressed

Bug 828278 - Discard the permission request when home button is pressed, r=etienne
Bug 851684 - [B2G][Contacts][Settings]: Cannot update the contacts label, the update button is grayed out [r=jmcf]
Bug 815653 - [Settings] - remove :active for explanation items

Conflicts:
	apps/settings/style/lists.css
Bug 816067 - Change FTU backgrounds
Bug 823414 - B2G browser gradient value does not match the gradient found in Settings
Bug 828908 - [Settings] Hints should not be treated as list items

Conflicts:
	apps/settings/index.html