Merge "Add documentation clarifying the differences between Surface/TextureView" into tm-dev