Merge "ueventd: fix other assorted style nits" into main