Merge "Update hearing device dialog UI" into main