Merge "CE: Layers only have FE layer state"