Merge "Hearing Aid: fix logic in connect and disconnect" into pi-dev