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

Change-Id: Ief335b85b37c41b128cd67727acd354c9a6642d2