Yes, this is a bit of a unique one, because SONAR_SCANNER_OPTS is now passed to the process that bootstraps the scanner, while SONAR_SCANNER_JAVA_OPTS gets passed to the scanner itself.
So to maintain compatibility for both versions, yes, you’ll need to include both.