Merge "CompositionEngine: fix memory leak in unit tests"