Merge "Preserve task when clearing top activities" into tm-dev