Merge "Introduce ActivityWindowInfo" into main