Merge "Switch pip to fixed-rotation in shell transitions"