Merge pull request #14354 from timdream/wallpaper-size

Bug 945098 - Don't hardcode HVGA in wallpaper selection, r=arthurcc, r=crdlc
Conflicts:
	apps/homescreen/js/wallpaper.js
	apps/settings/js/wallpaper.js