Merge changes I423219e9,Id5636cfc

* changes:
  Move movement bounds into PipBoundsState
  Move normal and expanded bounds into PipBoundsState