Merge "Backup the activities to finish on TaskFragmentContainer exits" into main