20.04 – Configure application switching to group windows by application

In Ubuntu 18.04, when I used Alt-TAB to switch applications, it defaulted to grouping windows together; I would be able to select a specific window by pausing on the desired app and then using Alt-<Backtick> to select between the application’s windows. However, in 20.04 this seems to be changed to having Alt-TAB switch between all windows. In my case, I have so many windows open concurrently that it scrolls off the right of the screen. But I only have about 8 different applications. I just have 8-9 terminal windows, 5-6 browser windows, etc. I would prefer the behavior from 18.04, which is more similar to my MacOS experience. I have not been able to find the correct configuration setting to adjust.