Merge "Fix to show PersonItemView for TYPE_CHOOSER_GRID correctly"