Merge "Fix uninstalling launcher detaches system overlays" into main