Merge "Refactor Surfaceflinger Layer::latchBuffer"