Merge "Add ActivityWindowInfo into ActivityRelaunchItem" into main