Manual sweep of !31444 (Updating MM tracking surfaces positions)

Hi,

since the automatic sweep of !31444 (merged) into master failed, here the manual sweep.

Best, Nico