Merge "Update multi-select preference to display a downstream screen instead of a dialog." into pi-car-dev