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

Change-Id: Ie8d55831069a056d589f9d4a9c82425be2b9f1e2