Merge "diag: Add PD buffering mode configuration support"