Merge "Merge "Configure DWB transition time per-device" into tm-qpr-dev am: ea95e62600 am: a389e64fc3"