Bug 811745 - Polishing Settings Display & Polishing Wallpaper picker
Bug 825831 - "User Guide" link in Settings app always points to en-US URL r=kaze

Always use the unlocalized URL for the user guide.
Merge pull request #6653 from guiora/bug-811745-rebase

Bug 811745 - polishing wallpaper
Auto-merge from branch 'master'