Merge "Remove usage of GlEngine" into tm-qpr-dev