Merge "diag: Synchronize command registration table access"