Merge "EglDisplay may be null and cause Null point exception" into qt-r1-dev