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

Change-Id: Ie20c919bb28fb365d249c173786117519c4db973