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

Change-Id: I3e5b34a93f6a56d91c4b38012d7db05915c41697