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

Change-Id: Ic87a251bde9316b0c11d902be435ced19df7fb98