Merge "Restore userxattr for overlayfs mounts" into main