Merge "Fix whitespace in TextureView" into mnc-dev