Merge pull request #9776 from gasolin/issue-869383

Bug 869383 fix pass HIDPI param to setting.json, r=@timdream(cherry picked from commit c51c8b38558fd82216ef8220368bd63cefc50322)
Merge pull request #9757 from deadsquid/google

Bug 811824 - Change default search to Google r=benfrancis(cherry picked from commit 8793aee46cfba6a506bc0f8f26f483183329fd62)