Bug 1065271 - [settings] help panel code cleanup
Merge pull request #23899 from gasolin/issue-1065271

Bug 1065271 - [settings] help panel code cleanup, r=arhtur