Merge "Refactor how we calculate offset for PIP animation" into pi-dev am: e33543ff69
am: 0a73c93b04

Change-Id: I29555e3702d8c3d83c0466d993e4f26eb31f23b1