Merge pull request #5706 from JosJuice/more-gamelist-speedup-followup More follow-up for the gamelist speedup PR
