Merge upstream/main into uniz

Dial-timeout (itzg#569) is now upstream, so this reconciles history. uniz keeps
its configurable --backend-dial-timeout (PR itzg#570 pending) and wake-ux patches;
no file changes result (uniz already contains all upstream content).

Author: wachirachoomsiri