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

Change-Id: Ia29d05f1cce12f2f767d07f109f8ea930572ac61