Merge "Merge "GL: unload system driver if needed" into qt-dev am: b040601098 am: 271c313425" into qt-r1-dev-plus-aosp