Merge "Reintroduce EGL mitigations from Android P." into qt-dev