Reduce locators, settings app
Merge pull request #14503 from viorelaioia/bug_942107_settings

Bug 942107 - Reduce locators, settings app