Merge "SF: refactor renderScreenImpl to use CompositionEngine"