Merge "Fix the Hearing Aids connected state in Settings App" into pi-dev