Merge "Always instantiate sound controller" into main