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

Change-Id: I50a4ab6d5902e01109560818233e2197b2a2996f