am 515f19da: Merge "Recreate EGLImage for previously used slots" into jb-dev

* commit '515f19da246a11c417c1771d4293e753f09e79b6':
  Recreate EGLImage for previously used slots