Merge julienw/841353-resolve-conflict to v1.0.1

Merge pull request #8132 from vingtetun/841353-followup

Bug 841353 - 'defer' more scripts. followup. r=etienne(cherry picked from commit 83ea6d7a59071369376be9ef9b4b397a378dc18a)

Conflicts:
	apps/browser/index.html