Merge "Disable flaky ShortcutLoggingTests" into main