Merge "Fix ShortcutLoggingTests flaky tests." into main