Merge "Merge "sustained perf: Create GLES2.0 context instead of GLES3.0" into pie-cts-dev am: 1098affc71"