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

Change-Id: If33e3213f5e6e5d3aac9fdaa2f33de6965b3fecd