Merge "Add surface/shown position to proto output"