Merge "Updating PIP to match UX"