Merge "Allow injecting layers by manifest metadata"