Merge "Fix texture corruption" into jb-mr1-dev