Merge "Revert "Destroy EGL context on colorfade.stop"" into udc-qpr-dev