Merge "Update PageViewCursor to correctly load window."