Merge pull request #8839 from evelynhung/issue-847851

Bug 847851 - change event hook to addEventListener, r=kaze(cherry picked from commit bebae47fca4c9072f787e382a5cefafc4435d6ba)

Conflicts:

	apps/settings/js/connectivity.js
Merge pull request #9227 from evelynhung/uplift-847851-v1.0.1

Merge pull request #8839 from evelynhung/issue-847851