Merge "Increase the timeout for Hearing Aids Pairing"