Merge "Fix Snapshot::resetClip to also reset the clip region"