Update: this worked for me!
All I did was add the 20-intel.conf as specified above. Then rebooted. It didn’t work after the first reboot, but after the second reboot I don’t seem to have this problem anymore. I’ll report back if the problem comes back.