Merge "Fix PIP snapping to incorrect location." into rvc-dev am: 6ad0b48b0a

Change-Id: I2827657f843b4266a53c0d2448ef9d5c7a2d03c8