Merge "Parameterize tests for Scene Container flag" into main