Merge "Fix a day/night bug in keyboard shortcut helper." into main