Merge "Allow remounting /mnt/user/0 as slave mount"