Merge "Fix broken ShortcutLoggingTests because of injectinputEvent" into main