Merge "Do lazy-unmount to /storage directly"