Merge "Allow delete empty TaskFragment in PiP" into tm-dev