Merge "Only fire extra pause for pip-ing apps" into tm-dev