Merge "Fix deadlock in DPMS" into tm-dev