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