Merge "Use default visibility for Snapshot::getLocalClip (attempt #2)."