Fix UI locators on settings tab

Change-Id: I1866d0b4d35c5b57b2e4acfeb143d72242a6ed9d
Merge "Fix UI locators on settings tab"