Merge "Revert "Set Change::Metadata on LayerMetadata update"" into main