Merge "Refactor TaskFragment related WindowContainerTransaction"