Merge "[Settings] Add override for getting parent locale" into main