Merge "SF: Fix onSurfaceFrameCreated for layers without buffers"