Merge "Surface: Add allocateBuffers to avoid render delay"