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

Change-Id: I63d41d12d76072bcf53453694202bf62902ae569