[#83699956] Overlay UI cleanup
Merge pull request #669 from Tahi-project/overlay-ui-cleanup

[#83699956] Overlay UI cleanup