Merge "Fix /mnt/user/<userid> permission bits"