I've applied the solution in the first post but unfortunately it made things worse. While I used to have loud clicks that are intermittent and come far in between, now I have softer but continuous clicks.
My external DAC is AudioEngine D1. I guess I will have to wait for 0.3 alpha and hope that the clicks and pops do get eliminated eventually.