Merge "Don't display gateway number on bluetooth"