Merge "SF: Revert one line that changed in moving doComposeSurfaces"