Merge "Add ActiviyWindowInfo into ActivityConfiguraionChangeItem" into main