Merge "Use correct StateSet for LayerVector compare."