Merge "Execute netd callbacks on CS handler thread" into main