Merge pull request #8109 from vingtetun/defer

Bug 841353 - 'defer' more scripts. r=etienne(cherry picked from commit 88568d9f69edf0fcb7c59613f961b8804f1eaa88)
Fix Bug 849876 as well.

Conflicts:
	apps/browser/index.html