Bug 1045656 - Followup in order to fix settings integration tests. r=me
Merge pull request #22395 from vingtetun/fix-settings-integration-tets

Bug 1045656 - Followup in order to fix settings integration tests. r=me