improve trusted location detection Upstream-commit: 94dc07c0445b57038fde8d79df06fe4401eca796 Component: engine