Merge "Track per-window information in ViewFrameInfo"