Merge "Clarify FRONT_BUFFER requirements"