Merge "Reuse compositions only when content key matching" into main