Merge "[Magnifier-71] Adapt surface buffer to elevation"