Merge "Add Tron Logging to Keyboard Shortcuts Helper"