Bug 1046158 - [Settings] Revert bug 1029902, logic for column display detection r=me
Merge pull request #22314 from KevinGrandon/bug_1046158_homescreen_settings_cleanup

Bug 1046158 - [Settings] Revert logic for column display detection