Merge "Refactor surfacefinger Layer::latchBuffer"