Merge "Don't offset snapshot surface position" into sc-v2-dev