I just made the swap and wanted to share my experience.
I got two used windows from a -21 model that I found online (I have a 2020)
Installing
Removing the inner panel is easy, I followed this video. Remember to disconnect/connect the light at the bottom to lower the window before testing...