Merge "diag: Add proper synchronization checks to msg mask table"