Merge remote-tracking branch 'origin/master' into develop

[Keyboard] SplitKB's Zima (#11577)

Co-authored-by: Thomas Baart <thomas@splitkb.com>
Co-authored-by: Joel Challis <git@zvecr.com>

Merge remote-tracking branch 'origin/master' into develop

Fix missing F2 in top row in AoS TKL maps (#11735)

Merge remote-tracking branch 'origin/master' into develop

undef TAPPING_TERM in users/hvp/hvp.h

rename callum's custom keycode that conflicts with a LUFA define

add missing _MACRO to users/brandonschlack/brandonschlack.h

check for BACKLIGHT_ENABLE so this works on all keyboards

change LAYOUT_planck_grid to LAYOUT_ortho_4x12

bring the bocaj keymap inline with LAYOUT_ortho_4x12

bring the xyverz keymap inline with LAYOUT_66_ansi

strip fn_actions

remove conflicting NKRO_ENABLE flag

add missing ADJUST key

make the tetris keymap fit

fix clueboard/66:magicmonty to bring hue under the 255 limit

fix chimera_ortho:gordon so it compiles

enable bluetooth on atreus:clash to fix compile error

enable LTO on atreus:ibnuda to bring it below the threshold