Merge "diag: Add new F3 mask and update event mask for diag logging"