Merge "SF: Move/refactor presentation loop to CompositionEngine"