Rebase off upstream

[ahoneybun]

Description

Types of Changes

• [x] Core
• [x] Bugfix
• [x] New feature
• [x] Enhancement/optimization
• [ ] Keyboard (addition or update)
• [x] Keymap/layout/userspace (addition or update)
• [x] Documentation

Issues Fixed or Closed by This PR

• Rebase off upstream

Checklist

• [ ] I have tested the changes and verified that they work and don't break anything (as well as I can manage).

[leviport]

Obsoleted by https://github.com/system76/qmk_firmware/pull/34