Merge "Merge "Remove GLSurfaceView and release EGL context." into qt-dev am: 2d6f9aa60a am: df132d6a4b" into qt-r1-dev-plus-aosp