Merge "Change NSSLTest to use @EnableSceneContainer" into main