Merge "Pass ActivityWindowInfo during relayout" into main