Merge "Add ActivityWindowInfo into LaunchActivityItem" into main