Xorg-server 21.1.2-2 breaks sleep

So, on the latest update (from 21.2rc1 to 21.2rc2), system no longer resumes from sleep.

Did a full clean reinstall (using again the 21.2rc1 ISO), tested and resume worked perfectly. Updated and resume was again broken.

Suspecting it was related to xorg rolled back the snapshot and updated this time ignoring xorg and system works properly.

System:
  Kernel: 5.15.7-1-MANJARO x86_64 bits: 64 compiler: gcc v: 11.1.0
    parameters: BOOT_IMAGE=/@/boot/vmlinuz-5.15-x86_64
    root=UUID=6c87cfff-cd85-4668-b8b3-7214f8e32320 rw rootflags=subvol=@ quiet
    splash apparmor=1 security=apparmor udev.log_priority=3
  Desktop: GNOME 41.2 tk: GTK 3.24.30 wm: gnome-shell dm: GDM 41.0
    Distro: Manjaro Linux base: Arch Linux
Machine:
  Type: Desktop Mobo: Gigabyte model: B450 AORUS M
    serial: <superuser required> UEFI: American Megatrends LLC. v: F62d
    date: 10/13/2021
Battery:
  Message: No system battery data found. Is one present?
Memory:
  RAM: total: 15.61 GiB used: 2.95 GiB (18.9%)
  RAM Report:
    permissions: Unable to run dmidecode. Root privileges required.
CPU:
  Info: model: AMD Ryzen 5 3600X bits: 64 type: MT MCP arch: Zen 2
    family: 0x17 (23) model-id: 0x71 (113) stepping: 0 microcode: 0x8701021
  Topology: cpus: 1x cores: 6 tpc: 2 threads: 12 smt: enabled cache:
    L1: 384 KiB desc: d-6x32 KiB; i-6x32 KiB L2: 3 MiB desc: 6x512 KiB
    L3: 32 MiB desc: 2x16 MiB
  Speed (MHz): avg: 2376 high: 3593 min/max: 2200/4409 boost: enabled
    scaling: driver: acpi-cpufreq governor: schedutil cores: 1: 3593 2: 2052
    3: 2053 4: 2196 5: 2195 6: 2196 7: 3489 8: 2117 9: 2050 10: 2196 11: 2194
    12: 2192 bogomips: 91061
  Flags: 3dnowprefetch abm adx aes aperfmperf apic arat avic avx avx2 bmi1
    bmi2 bpext cat_l3 cdp_l3 clflush clflushopt clwb clzero cmov cmp_legacy
    constant_tsc cpb cpuid cqm cqm_llc cqm_mbm_local cqm_mbm_total
    cqm_occup_llc cr8_legacy cx16 cx8 de decodeassists extapic extd_apicid
    f16c flushbyasid fma fpu fsgsbase fxsr fxsr_opt ht hw_pstate ibpb ibs
    irperf lahf_lm lbrv lm mba mca mce misalignsse mmx mmxext monitor movbe
    msr mtrr mwaitx nonstop_tsc nopl npt nrip_save nx osvw overflow_recov pae
    pat pausefilter pclmulqdq pdpe1gb perfctr_core perfctr_llc perfctr_nb
    pfthreshold pge pni popcnt pse pse36 rapl rdpid rdpru rdrand rdseed rdt_a
    rdtscp rep_good sep sev sev_es sha_ni skinit smap smca sme smep ssbd sse
    sse2 sse4_1 sse4_2 sse4a ssse3 stibp succor svm svm_lock syscall tce
    topoext tsc tsc_scale umip v_spec_ctrl v_vmsave_vmload vgif vmcb_clean vme
    vmmcall wbnoinvd wdt xgetbv1 xsave xsavec xsaveerptr xsaveopt xsaves
  Vulnerabilities:
  Type: itlb_multihit status: Not affected
  Type: l1tf status: Not affected
  Type: mds status: Not affected
  Type: meltdown status: Not affected
  Type: spec_store_bypass
    mitigation: Speculative Store Bypass disabled via prctl and seccomp
  Type: spectre_v1
    mitigation: usercopy/swapgs barriers and __user pointer sanitization
  Type: spectre_v2 mitigation: Full AMD retpoline, IBPB: conditional, STIBP:
    conditional, RSB filling
  Type: srbds status: Not affected
  Type: tsx_async_abort status: Not affected
Graphics:
  Device-1: NVIDIA GA104 [GeForce RTX 3070 Ti] driver: nvidia v: 495.44
    alternate: nouveau,nvidia_drm bus-ID: 0b:00.0 chip-ID: 10de:2482
    class-ID: 0300
  Display: x11 server: X.org 1.21.1.1 compositor: gnome-shell driver:
    loaded: nvidia resolution: <missing: xdpyinfo>
  Message: Unable to show advanced data. Required tool glxinfo missing.
Audio:
  Device-1: NVIDIA GA104 High Definition Audio driver: snd_hda_intel v: kernel
    bus-ID: 0b:00.1 chip-ID: 10de:228b class-ID: 0403
  Device-2: AMD Starship/Matisse HD Audio vendor: Gigabyte
    driver: snd_hda_intel v: kernel bus-ID: 0d:00.4 chip-ID: 1022:1487
    class-ID: 0403
  Sound Server-1: ALSA v: k5.15.7-1-MANJARO running: yes
  Sound Server-2: JACK v: 1.9.19 running: no
  Sound Server-3: PulseAudio v: 15.0 running: yes
  Sound Server-4: PipeWire v: 0.3.40 running: no
Network:
  Device-1: Realtek RTL8111/8168/8411 PCI Express Gigabit Ethernet
    vendor: Gigabyte driver: r8169 v: kernel port: e000 bus-ID: 08:00.0
    chip-ID: 10ec:8168 class-ID: 0200
  IF: eno1 state: up speed: 1000 Mbps duplex: full mac: <filter>
  IP v4: <filter> type: dynamic noprefixroute scope: global
    broadcast: <filter>
  IP v6: <filter> type: noprefixroute scope: link
  WAN IP: <filter>
Bluetooth:
  Message: No bluetooth data found.
Logical:
  Message: No logical block device data found.
RAID:
  Message: No RAID data found.
Drives:
  Local Storage: total: 3.21 TiB used: 10.82 GiB (0.3%)
  SMART Message: Required tool smartctl not installed. Check --recommends
  ID-1: /dev/nvme0n1 maj-min: 259:0 vendor: Samsung model: SSD 970 EVO 500GB
    size: 465.76 GiB block-size: physical: 512 B logical: 512 B speed: 31.6 Gb/s
    lanes: 4 type: SSD serial: <filter> rev: 2B2QEXE7 temp: 31.9 C scheme: GPT
  ID-2: /dev/sda maj-min: 8:0 vendor: Samsung model: SSD 860 QVO 1TB
    size: 931.51 GiB block-size: physical: 512 B logical: 512 B speed: 6.0 Gb/s
    type: SSD serial: <filter> rev: 2B6Q scheme: GPT
  ID-3: /dev/sdb maj-min: 8:16 vendor: Seagate model: ST2000DM008-2FR102
    size: 1.82 TiB block-size: physical: 4096 B logical: 512 B speed: 6.0 Gb/s
    type: HDD rpm: 7200 serial: <filter> rev: 0001 scheme: GPT
  ID-4: /dev/sdc maj-min: 8:32 type: USB vendor: SanDisk
    model: Ultra USB 3.0 size: 28.64 GiB block-size: physical: 512 B
    logical: 512 B type: N/A serial: <filter> rev: 1.00 scheme: MBR
  Message: No optical or floppy data found.
Partition:
  ID-1: / raw-size: 465.47 GiB size: 465.47 GiB (100.00%)
    used: 10.79 GiB (2.3%) fs: btrfs dev: /dev/nvme0n1p2 maj-min: 259:2
    label: ROOT uuid: 6c87cfff-cd85-4668-b8b3-7214f8e32320
  ID-2: /boot/efi raw-size: 300 MiB size: 299.4 MiB (99.80%)
    used: 29.4 MiB (9.8%) fs: vfat dev: /dev/nvme0n1p1 maj-min: 259:1
    label: NO_LABEL uuid: 114A-79F4
  ID-3: /home raw-size: 465.47 GiB size: 465.47 GiB (100.00%)
    used: 10.79 GiB (2.3%) fs: btrfs dev: /dev/nvme0n1p2 maj-min: 259:2
    label: ROOT uuid: 6c87cfff-cd85-4668-b8b3-7214f8e32320
  ID-4: /run/timeshift/backup raw-size: 465.47 GiB
    size: 465.47 GiB (100.00%) used: 10.79 GiB (2.3%) fs: btrfs
    dev: /dev/nvme0n1p2 maj-min: 259:2 label: ROOT
    uuid: 6c87cfff-cd85-4668-b8b3-7214f8e32320
  ID-5: /var/cache raw-size: 465.47 GiB size: 465.47 GiB (100.00%)
    used: 10.79 GiB (2.3%) fs: btrfs dev: /dev/nvme0n1p2 maj-min: 259:2
    label: ROOT uuid: 6c87cfff-cd85-4668-b8b3-7214f8e32320
  ID-6: /var/log raw-size: 465.47 GiB size: 465.47 GiB (100.00%)
    used: 10.79 GiB (2.3%) fs: btrfs dev: /dev/nvme0n1p2 maj-min: 259:2
    label: ROOT uuid: 6c87cfff-cd85-4668-b8b3-7214f8e32320
Swap:
  Alert: No swap data was found.
Unmounted:
  ID-1: /dev/sda1 maj-min: 8:1 size: 16 MiB fs: <superuser required>
    label: N/A uuid: N/A
  ID-2: /dev/sda2 maj-min: 8:2 size: 931.5 GiB fs: ntfs label: N/A
    uuid: 64E8F69EE8F66E24
  ID-3: /dev/sdb2 maj-min: 8:18 size: 1.82 TiB fs: ntfs label: MEDIA
    uuid: 52B45611B455F845
  ID-4: /dev/sdc1 maj-min: 8:33 size: 3.27 GiB fs: iso9660
  ID-5: /dev/sdc2 maj-min: 8:34 size: 4 MiB fs: vfat label: MISO_EFI
    uuid: 8704-2F24
USB:
  Hub-1: 1-0:1 info: Hi-speed hub with single TT ports: 10 rev: 2.0
    speed: 480 Mb/s chip-ID: 1d6b:0002 class-ID: 0900
  Device-1: 1-5:2 info: SINO WEALTH Gaming KB type: Keyboard,HID
    driver: hid-generic,usbhid interfaces: 2 rev: 1.1 speed: 12 Mb/s
    power: 500mA chip-ID: 258a:002a class-ID: 0300
  Device-2: 1-6:3 info: Sunplus Innovation Gaming mouse [Philips SPK9304]
    type: Mouse driver: hid-generic,usbhid interfaces: 1 rev: 2.0
    speed: 1.5 Mb/s power: 98mA chip-ID: 1bcf:08a0 class-ID: 0301
  Device-3: 1-8:4 info: NZXT USB Device type: HID driver: hid-generic,usbhid
    interfaces: 1 rev: 2.0 speed: 12 Mb/s power: 100mA chip-ID: 1e71:2007
    class-ID: 0300 serial: <filter>
  Hub-2: 2-0:1 info: Super-speed hub ports: 4 rev: 3.1 speed: 10 Gb/s
    chip-ID: 1d6b:0003 class-ID: 0900
  Device-1: 2-3:2 info: SanDisk Ultra Flair type: Mass Storage
    driver: usb-storage interfaces: 1 rev: 3.0 speed: 5 Gb/s power: 896mA
    chip-ID: 0781:5591 class-ID: 0806 serial: <filter>
  Hub-3: 3-0:1 info: Hi-speed hub with single TT ports: 4 rev: 2.0
    speed: 480 Mb/s chip-ID: 1d6b:0002 class-ID: 0900
  Hub-4: 4-0:1 info: Super-speed hub ports: 4 rev: 3.1 speed: 10 Gb/s
    chip-ID: 1d6b:0003 class-ID: 0900
Sensors:
  System Temperatures: cpu: N/A mobo: N/A gpu: nvidia temp: 35 C
  Fan Speeds (RPM): N/A gpu: nvidia fan: 0%
Info:
  Processes: 335 Uptime: 20m wakeups: 7 Init: systemd v: 249 tool: systemctl
  Compilers: gcc: N/A Packages: pacman: 1120 lib: 295 flatpak: 0 Shell: Zsh
  v: 5.8 running-in: gnome-terminal inxi: 3.3.11