Merge "Show only 1 entry for hearing aid devices without killing the activity." into pi-dev