Merge "Sort contact using sort key." into pi-car-dev