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