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

Change-Id: Ib1035269941c14700244c3245526b3648d429cdb