Merge "SF: Move/Refactor doComposition and doDisplayComposition to CompositionEngine"