Merge "ART: Fix SelectKind to work with nullptr"