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

Change-Id: I23ab9b3e1d65a30703d77b11adc84a1b8ac1862a