Merge "GL: unload system driver if needed" into qt-dev
am: b040601098

Change-Id: I6206690cb7c3ce066466f6d0464cef7b58576d6d