Merge "fstab: allow mounting other slot"