Merge "Remove usage of GlEngine (cherry-pick in master)"