Merge "Make snapshot surface relative to parent" into rvc-dev