Merge "Split the lock synchronizing LMKD socket reads/writes" into main