Dispose of the composition when we're done with it. (#2494)

Dispose of the composition when we're done with it. (#2494) #1874