Merge "Make sure symlinks created by ueventd are correctly labeled" into main