Merge "fix: Only do spatial SVC when there are > 1 layers"