Merge "Added contentSize to WindowInfo" into main