Merge "Fix strange pip size in horizontal expanded mode" into tm-dev