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

Change-Id: I42d22d13e9fc2486688b6ce59a92194b19b6cb52