Merge "Add tracing to GLSurfaceView" into mnc-dev