Merge "Fix the jumpcut surface position" into main