Merge "CE: Snapshot layer metadata"