am 8632b85b: Merge "Fix issues around GL on incorrect thread" into lmp-preview-dev

* commit '8632b85b3ceca1b64ca37843ffd87bc10f4ae72f':
  Fix issues around GL on incorrect thread