Locator: UI updates to match v2.4.4
Merge branch 'master_locator' into custom_v2.4.4