Merge "Only move Task to PiP if there is only one non-finishing activity" into tm-dev