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

Change-Id: I155e7d5c0b99c5acf2baa3fb7243256822206c91