Merge "User-resize pip to normal bounds when (un)folding" into tm-qpr-dev