Merge "Fix WindowFrameTest error."