Merge "Fix corss-link hearing device settings" into main