Merge "[incfs] fix the storage loading for existing mounts" into rvc-dev