Merge "Use rect instead of four int frame values for WindowInfo" into main