Merge pull request #11215 from huchengtw-moz/settings/Bug_897918_settings_app_should_use_hi-res_image

Bug 897918 - Settings app should use hi-res icons on hd phones, r=arthurcc(cherry picked from commit 4c744eafa32a80a890d9d93b8ac5ef6198797880)

Conflicts:
	apps/settings/js/apps.js
Merge pull request #11834 from huchengtw-moz/settings/Bug_908628_v1-train

Bug 908628 - App permission icons are blurry for some marketplace apps
 this patch is uplift from Bug 897918 which is r=arthurcc
Merge branch 'v1-train' into v1.1.0hd