Merge "Revert "Remove EGL surface in the update thread"" into devel/master