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

Change-Id: I80219d469696400a0a93f3be245a5456f979b083