Merge "Extract DebugDrawable from NPVC into its own class" into tm-qpr-dev