Merge "Support a mount mode to bypass FUSE on /storage"