am 62ea4363: Merge "Fix texture corruption" into jb-mr1-dev

* commit '62ea4363362526d32b48f920601d3b4e27a117bb':
  Fix texture corruption