Merge changes I899d8aa3,Ib6e0058a

* changes:
  Don't allow PiP to be interactive when stashed.
  Set PiP stashing to a set 32dp away from the edge of the screen.