Merge "diag: dci: Handle dci mutex correctly"