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

Change-Id: I492da715e924cd7d5f1c2e9ec92b25f2e4d5109f