Merge "Add stash support for PIP."