Merge "Add ActivityWindowInfo into MoveToDisplayItem" into main