Merge "diag: Fix log, event and msg mask status in control packets"