Merge "Prevent app fuse from indefinitely trying if it gets ENOBUFS" into main