Merge "Keep candidates in radio button picker UI ordered"