Bug 1089459 - [Settings] Performance regression on bug 1066830
Merge pull request #25687 from EragonJ/v2.1-bug-1089459

Bug 1089459 - [Settings] Performance regression on bug 1066830