Merge "ueventd: refactor uevent handling"