Merge "gpu_tonemapper: Clear EGLImage mappings in Tonemapper"