Merge changes If42d4470,Ia0b701b7 into sc-dev

* changes:
  PiP: Add tap-to-unstash function.
  PiP: Allow stashing via dropping on the edge.