Merge "diag: Update masks to peripherals in workqueue context"