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

Change-Id: I65e587befec2dcba43b95fe6c6d8775a918fd332