Merge "Clean-up egl image preallocation" into qt-dev