Merge "Fix non-hearing devices show in pair new hearing devices page" into udc-dev