Merge "Update TextureView's layer on size change Bug #7171323" into jb-mr1-dev