Fixes to compile commands file watchers fallback logic (#12948)

Fixes to compile commands file watchers fallback logic (#12948) #6775