Merge "Move default pip position to right above the shelf." into pi-dev
am: 017f44be88

Change-Id: I0b61860bedd0b949dbd2b2f87b10149c3577559b