Merge "Wait for buffers to be latched in ChildLayerTest"