Merge 2 menus of sdwdate tray (better UX)

yes it is a bug in 4.2.