Merge "[automerger skipped] Merge "Revert "Destroy EGL context on colorfade.stop"" into udc-qpr-dev am: 968471b324 am: 17a3f6a315 -s ours" into main