Merge "Fix layer metadata key for a11y ID."