Merge "uevent.c: avoid POLLERR infinite loop" into main