Merge "Fix bug in DPM#setDrawable" into tm-dev