Merge "Use correct StateSet for LayerVector compare." into pi-dev