Merge "Fix layer creation metadata parceling"