Merge "Honor the property overrides for GLES." into qt-dev
am: 15800858fa

Change-Id: Ie5fa0528a68279a29fd6ccfb9dbe392f4032cb44