Merge "Ensure that LayerFECompositionState's fence is always non-null"