Merge "Clear draw flags when updating TextureView's layer Bug #7171323" into jb-mr1-dev