Merge "Don't launch placeholder for bottom TaskFragment when waiting for top" into tm-dev