Merge "Reintroduce WCG drawing if supported" into tm-qpr-dev