Merge "Fix PIP snapping to incorrect location." into rvc-dev