Merge "Avoid extraneous EGL surface allocations Bug #8667873" into jb-mr2-dev