Merge "fix TextureViewTest" into jb-mr2-dev