Merge "Improve our EGL management when pausing / resuming."