Merge "Allow switching between sdcardfs and FUSE mounts"