Merge "Fix issues around GL on incorrect thread" into lmp-preview-dev