Merge "Fix select behavior in picking mode"