Fix live dev highlight being out of place in edge cases
Merge pull request #8922 from MarcelGerber/ld-hightlight-position

Fix live dev highlight being out of place in edge cases
Merge branch 'master' into alf_localization