Merge "Use shared surface session for snapshot surface" into main