Merge "Add tests for multi container dimming and surface removal" into main