Ensure movement bounds for shift account for current bounds

Bug: 159250094
Test: Resize pip near the shelf offset area and change the shelf offset
Change-Id: I5ef13b1518a79b9f46a15ae448bd674ac1cb4d3c
2 files changed