Merge "Update last surface position before unrotating"