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

[Keymap] Add paulomp90 lily58 keymap (#20327)

Co-authored-by: Drashna Jaelre <drashna@live.com>

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

[Keymap] Add personal keymap for Lily58 (#18735)

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

[Keyboard] Fix h87 g2 VID conflict (#20388)

[Keyboard] Add support for ISO version of Durgod Hades (#20110)

Co-authored-by: Ryan <fauxpark@gmail.com>

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

[Keymap] PHSC138 Keymap for Atom47 (#18768)

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>

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

[Keyboard] add kb2040 flavor of gherkin (#18360)

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

[Keyboard] ymdk/id75 (#19967)

Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>

quantum/action_util.c: Use uint8_t for oneshot_layer_data (#20423)

Fix preprocessor condition for SPLIT_HAPTIC_ENABLE (#20411)

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

fixing bug that caused KC_DEL and KC_MUTE (encoder press) to be swapped (#20420)

Move single `LAYOUT`s to data driven (#20365)

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

4pplet/bootleg/rev_a Layout Macro Conversion and Addition (#20400)

* info.json: apply friendly formatting

* move matrix data to info.json

* add LAYOUT_60_ansi_split_bs_rshift